From efc7f902ded345652c3ca4bd20a2238a8f52d6cb Mon Sep 17 00:00:00 2001
From: yvesn <yvesn>
Date: Fri, 30 Jun 2017 10:43:57 +0000
Subject: [PATCH] SSDM-5274: renamed STORAGE_RACK to STORAGE
SVN: 38483
---
.../dist/core-plugins/eln-lims/1/as/elnTypes.py | 2 +-
.../1/as/webapps/eln-lims/html/js/config/Profile.js | 8 ++++----
.../html/js/views/SettingsForm/SettingsFormView.js | 4 ++--
.../1/dss/reporting-plugins/eln-lims-api/script.py | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/elnTypes.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/elnTypes.py
index 53cd25d896a..0bd9230793e 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/elnTypes.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/elnTypes.py
@@ -919,7 +919,7 @@ GENERAL_ELN_SETTINGS = [MANDATORY_ITEM_VERSION, False, "GENERAL_ELN_SETTINGS", "
##
## Types - Storage
##
-STORAGE_RACK = [MANDATORY_ITEM_VERSION, False, "STORAGE_RACK", "", [
+STORAGE_RACK = [MANDATORY_ITEM_VERSION, False, "STORAGE", "", [
[FIRST_TIME_VERSIONED, "NAME", "General", "Name", DataType.VARCHAR, None, "Name", None, None],
[FIRST_TIME_VERSIONED, "ROW_NUM", "General", "Row", DataType.INTEGER, None, "Row", None, None],
[FIRST_TIME_VERSIONED, "COLUMN_NUM", "General", "Column", DataType.INTEGER, None, "Column", None, None],
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js
index 7428fc741cc..56a5780baf5 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js
@@ -157,7 +157,7 @@ $.extend(DefaultProfile.prototype, {
this.copyPastePlainText = false;
this.hideCodes = true;
this.hideTypes = {
- "sampleTypeCodes" : ["GENERAL_ELN_SETTINGS", "STORAGE_POSITION", "STORAGE_RACK"],
+ "sampleTypeCodes" : ["GENERAL_ELN_SETTINGS", "STORAGE_POSITION", "STORAGE"],
"experimentTypeCodes" : []
}
this.hideSpaces = ["ELN_SETTINGS", "STORAGE"];
@@ -264,7 +264,7 @@ $.extend(DefaultProfile.prototype, {
callbackFunction(null);
}
- mainController.serverFacade.searchByType("STORAGE_RACK", function(results) {
+ mainController.serverFacade.searchByType("STORAGE", function(results) {
var configs = [];
for(var idx = 0; idx < results.length; idx++) {
configs.push(_this.getStorageConfigFromSample(results[idx]));
@@ -279,7 +279,7 @@ $.extend(DefaultProfile.prototype, {
callbackFunction(null);
}
- mainController.serverFacade.searchWithType("STORAGE_RACK", storageCode, null, function(results) {
+ mainController.serverFacade.searchWithType("STORAGE", storageCode, null, function(results) {
callbackFunction(_this.getStorageConfigFromSample(results[0]));
});
}
@@ -791,7 +791,7 @@ $.extend(DefaultProfile.prototype, {
_this.initDatasetTypeCodes(function() {
_this.initSettings(function() {
//Check if the new storage system can be enabled
- var storageRack = _this.getSampleTypeForSampleTypeCode("STORAGE_RACK");
+ var storageRack = _this.getSampleTypeForSampleTypeCode("STORAGE");
var storagePositionType = _this.getSampleTypeForSampleTypeCode("STORAGE_POSITION");
_this.storagesConfiguration = {
"isEnabled" : storageRack && storagePositionType
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js
index bc3faaebbd5..47eb0b4f4d1 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js
@@ -119,7 +119,7 @@ function SettingsFormView(settingsFormController, settingsFormModel) {
var $addBtn = FormUtil.getButtonWithIcon("glyphicon-plus", function() {
var argsMap = {
- "sampleTypeCode" : "STORAGE_RACK",
+ "sampleTypeCode" : "STORAGE",
"experimentIdentifier" : experimentIdentifier
}
var argsMapStr = JSON.stringify(argsMap);
@@ -135,7 +135,7 @@ function SettingsFormView(settingsFormController, settingsFormModel) {
var advancedSampleSearchCriteria = {
entityKind : "SAMPLE",
logicalOperator : "AND",
- rules : { "1" : { type : "Attribute", name : "SAMPLE_TYPE", value : "STORAGE_RACK" } }
+ rules : { "1" : { type : "Attribute", name : "SAMPLE_TYPE", value : "STORAGE" } }
}
var dataGrid = SampleDataGridUtil.getSampleDataGrid(experimentIdentifier, advancedSampleSearchCriteria, null, null, null, null, true, null, false);
var extraOptions = [];
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
index 5364bf0b449..d83c5347b6b 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
@@ -397,12 +397,12 @@ def init(tr, parameters, tableBuilder):
defaultExperiment = tr.createNewExperiment("/DEFAULT_LAB_NOTEBOOK/DEFAULT_PROJECT/DEFAULT_EXPERIMENT", "DEFAULT_EXPERIMENT");
defaultExperiment.setPropertyValue("NAME", "Default Experiment");
- if isSampleTypeAvailable(installedTypes, "STORAGE_RACK"):
+ if isSampleTypeAvailable(installedTypes, "STORAGE"):
insertProjectIfMissing(tr, "/ELN_SETTINGS/STORAGES", projectsCache);
storageCollection = insertExperimentIfMissing(tr, "/ELN_SETTINGS/STORAGES/STORAGES_COLLECTION", "COLLECTION", "Storages Collection");
try: # If the sample exists, the API will return an Immutable Sample, when using the setters, an exception will be thrown
- bench = insertSampleIfMissing(tr, "/ELN_SETTINGS/BENCH", storageCollection, "STORAGE_RACK");
+ bench = insertSampleIfMissing(tr, "/ELN_SETTINGS/BENCH", storageCollection, "STORAGE");
bench.setPropertyValue("NAME", "Bench");
bench.setPropertyValue("ROW_NUM", "1");
bench.setPropertyValue("COLUMN_NUM", "1");
@@ -414,7 +414,7 @@ def init(tr, parameters, tableBuilder):
pass # Do nothing if sample existed already
try: # If the sample exists, the API will return an Immutable Sample, when using the setters, an exception will be thrown
- defaultStorage = insertSampleIfMissing(tr, "/ELN_SETTINGS/DEFAULT_STORAGE", storageCollection, "STORAGE_RACK");
+ defaultStorage = insertSampleIfMissing(tr, "/ELN_SETTINGS/DEFAULT_STORAGE", storageCollection, "STORAGE");
defaultStorage.setPropertyValue("NAME", "Default Storage");
defaultStorage.setPropertyValue("ROW_NUM", "4");
defaultStorage.setPropertyValue("COLUMN_NUM", "4");
--
GitLab