SSDM-5080 : STORAGE_NAMES no longer necessary.

SVN: 38403

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/elnTypes.py

@@ -549,12 +549,6 @@ PLASMID_RELATIONSHIP = [FIRST_TIME_VERSIONED, "PLASMID_RELATIONSHIP", "Kind of p
                                             ["LOST", "Lost", None],
                                             ["OTHER", "Other", None]
                                         ]];
-                                        
-STORAGE_NAMES = [FIRST_TIME_VERSIONED, "STORAGE_NAMES", "Storages available on the lab",
-                                        [
-                                            ["BENCH", "Bench", None],
-                                            ["DEFAULT_STORAGE", "Default Storage", None]
-                                        ]];
 
 STORAGE_BOX_SIZE = [FIRST_TIME_VERSIONED, "STORAGE_BOX_SIZE", "Boxes available on the lab",
                                         [
@@ -934,7 +928,7 @@ STORAGE_RACK = [MANDATORY_ITEM_VERSION, False, "STORAGE_RACK", "", [
 ]];
 
 STORAGE_POSITION = [MANDATORY_ITEM_VERSION, False, "STORAGE_POSITION", "", [
-    [FIRST_TIME_VERSIONED, "STORAGE_NAMES",                 "Physical Storage",        "Storage Name",              DataType.CONTROLLEDVOCABULARY,       "STORAGE_NAMES",     "Storage Name",       None, None, False, False],
+    [FIRST_TIME_VERSIONED, "STORAGE_NAMES",                 "Physical Storage",        "Storage Name",              DataType.VARCHAR,                    None,                "Storage Name",       None, None, False, False],
     [FIRST_TIME_VERSIONED, "STORAGE_ROW",                   "Physical Storage",        "Storage Row",               DataType.INTEGER,                    None,                "Storage Row",        None, None, False, False],
     [FIRST_TIME_VERSIONED, "STORAGE_COLUMN",                "Physical Storage",        "Storage Column",            DataType.INTEGER,                    None,                "Storage Column",     None, None, False, False],
     [FIRST_TIME_VERSIONED, "STORAGE_BOX_NAME",              "Physical Storage",        "Storage Box Name",          DataType.VARCHAR,                    None,                "Storage Box Name",   None, None, False, False],

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/initializemasterdataminimum.py

@@ -31,7 +31,6 @@ def initBasicMasterData(tr):
     elnTypes.createVocabularyWithTerms(tr, elnTypes.EXPERIMENTAL_READOUT);
     elnTypes.createVocabularyWithTerms(tr, elnTypes.MACHINE);
     elnTypes.createVocabularyWithTerms(tr, elnTypes.STORAGE_VALIDATION_LEVEL);
-    elnTypes.createVocabularyWithTerms(tr, elnTypes.STORAGE_NAMES);
     elnTypes.createVocabularyWithTerms(tr, elnTypes.STORAGE_BOX_SIZE);
     
     ##