From 08b74ea78f16a0d7767bee3c5c2e7b88b9f62a9b Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 14 Oct 2014 09:38:51 +0000
Subject: [PATCH] Delete deprecated functions
SVN: 32609
---
.../newbrowser/html/js/config/Profile.js | 16 +--------------
.../views/SampleForm/SampleFormController.js | 20 ++++---------------
.../js/views/SampleForm/SampleFormView.js | 19 +++++++-----------
3 files changed, 12 insertions(+), 43 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
index c7f6160d915..49cf5ab380c 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
@@ -34,7 +34,7 @@ $.extend(DefaultProfile.prototype, {
this.searchDomains = [ { "@id" : -1, "@type" : "GobalSearch", label : "Global", name : "global"}];
this.ELNExperiments = ["SYSTEM_EXPERIMENT"];
this.notShowTypes = ["SYSTEM_EXPERIMENT"];
- this.inventorySpaces = [];
+ this.inventorySpaces = ["INVENTORY"];
this.isInventorySpace = function(spaceCode) {
return ($.inArray(spaceCode, this.inventorySpaces) !== -1);
@@ -206,25 +206,12 @@ $.extend(DefaultProfile.prototype, {
/*
* Used by Sample Table
*/
-
this.isShowUnavailablePreviewOnSampleTable = true;
- /*
- * Used by Sample Form
- */
-
- this.getSpaceForSampleType = function(type) {
- return "DEFAULT";
- }
-
- this.getExperimentIdentifierForSample = function(type, code, properties) {
- return "/" + this.getSpaceForSampleType(type) + "/PROJECT_" + type + "/FOLDER_" + type;
- }
/*
* Used by DataSet Form
*/
-
//Null: Show checkbox to manually input
//True: Automatic configuration, will unzip the file before atacching the files
//False: Will do nothing to the file before attaching
@@ -235,7 +222,6 @@ $.extend(DefaultProfile.prototype, {
/*
* Used by Main Menu
*/
-
this.mainMenuContentExtra = function() {
return "";
}
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormController.js
index 79397735bef..32fbeaeebde 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormController.js
@@ -103,24 +103,12 @@ function SampleFormController(mainController, mode, sample) {
//
//Identification Info
//
- var sampleCode = this._sampleFormModel.sample.code;
- var properties = this._sampleFormModel.sample.properties;
-
- var sampleSpace = this._sampleFormModel.sample.spaceCode; //ELN Sub Experiments will have a space by default but not common Samples
- if(!sampleSpace) { //Common Samples have maybe a default space to be attached to
- sampleSpace = profile.getSpaceForSampleType(this.sampleTypeCode);
- }
-
- var experimentIdentifier = this._sampleFormModel.sample.experimentIdentifierOrNull; //ELN Sub Experiments will have a experiment by default but not common Samples
- if(!experimentIdentifier) { //Common Samples have maybe a default experiment to be attached to
- experimentIdentifier = profile.getExperimentIdentifierForSample(
- this._sampleFormModel.sample.sampleTypeCode,
- this._sampleFormModel.sample.code,
- properties);
- }
-
+ var sampleSpace = this._sampleFormModel.sample.spaceCode;
var sampleProject = null;
var sampleExperiment = null;
+ var sampleCode = this._sampleFormModel.sample.code;
+ var properties = this._sampleFormModel.sample.properties;
+ var experimentIdentifier = this._sampleFormModel.sample.experimentIdentifierOrNull;
if(experimentIdentifier) { //If there is a experiment detected, the sample should be attached to the experiment completely.
sampleSpace = experimentIdentifier.split("/")[1];
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js
index 3c9e052d6fa..a6c067a2bae 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js
@@ -119,18 +119,13 @@ function SampleFormView(sampleFormController, sampleFormModel) {
if(this._sampleFormModel.isELNSubExperiment) {
$formColumn.append(FormUtil.getFieldForLabelWithText("Experiment", this._sampleFormModel.sample.experimentIdentifierOrNull));
} else {
- var defaultSpace = profile.getSpaceForSampleType(sampleTypeCode);
- if(!defaultSpace) {
- var spacesDropDown = FormUtil.getSpaceDropdown();
- $formColumn.append(FormUtil.getFieldForComponentWithLabel(spacesDropDown, "Space"));
- spacesDropDown.change(function(event){
- var spacesDropDown = $(this);
- _this._sampleFormModel.sample.spaceCode = spacesDropDown.val();
- _this._sampleFormModel.isFormDirty = true;
- });
- } else {
- $formColumn.append(FormUtil.getFieldForLabelWithText("Space", defaultSpace));
- }
+ var spacesDropDown = FormUtil.getSpaceDropdown();
+ $formColumn.append(FormUtil.getFieldForComponentWithLabel(spacesDropDown, "Space"));
+ spacesDropDown.change(function(event){
+ var spacesDropDown = $(this);
+ _this._sampleFormModel.sample.spaceCode = spacesDropDown.val();
+ _this._sampleFormModel.isFormDirty = true;
+ });
}
//
--
GitLab