LMS-1783 some column ids changed to previous ids

SVN: 19146

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleGridColumnIDs.java

@@ -52,10 +52,10 @@ public class SampleGridColumnIDs
     
     public static final String PERM_ID = "PERM_ID";
     
-    public static final String SHOW_DETAILS_LINK_COLUMN_NAME = "SHOW_DETAILS_LINK_COLUMN_NAME";
+    public static final String SHOW_DETAILS_LINK_COLUMN_NAME = "SHOW_DETAILS_LINK";
     
-    public static final String PARENTS = "PARENTS";
+    public static final String PARENTS = "generatedFromParent";
     
-    public static final String CONTAINER_SAMPLE = "CONTAINER_SAMPLE";
+    public static final String CONTAINER_SAMPLE = "containerParent";
 }
 

openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js

@@ -33,7 +33,7 @@ var common = {
   tab_link_message: "Copy this {0} and use it to access openBIS with current tab opened.",
   permlink_column_name: "Permlink",
   overview_column_name: "Overview",
-  show_details_link_column_name: "Show Details Link",
+  show_details_link: "Show Details Link",
   show_details_link_text_value: "Permlink",
   table_operations: "Table:",
   entity_operations: "Entity:",
@@ -176,7 +176,8 @@ var common = {
   experiment_identifier: "Experiment Identifier",
   generated_from: "Parent {0}",
   part_of: "Container",
-  container_sample: "Container",
+  generatedfromparent: "Parents",
+  containerparent: "Container",
   invalidation: "Invalidation",
   invalidation_template: "Invalidated by: {0}<br>Invalidation Date: {1}<br>Invalidation Reason: {2}",
   

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProviderTest.java

@@ -94,7 +94,7 @@ public class SampleProviderTest extends AssertJUnit
         assertEquals("[CODE, SUBCODE, DATABASE_INSTANCE, SPACE, SAMPLE_IDENTIFIER, SAMPLE_TYPE, "
                 + "IS_INSTANCE_SAMPLE, IS_INVALID, REGISTRATOR, REGISTRATION_DATE, "
                 + "EXPERIMENT, EXPERIMENT_IDENTIFIER, PROJECT, "
-                + "PERM_ID, SHOW_DETAILS_LINK_COLUMN_NAME, PARENTS, CONTAINER_SAMPLE, "
+                + "PERM_ID, SHOW_DETAILS_LINK, generatedFromParent, containerParent, "
                 + "property-USER-NAME, property-USER-MY-MATERIAL, property-USER-NUMBER]",
                 getHeaderIDs(tableModel).toString());
         assertEquals("[VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, "
@@ -143,7 +143,7 @@ public class SampleProviderTest extends AssertJUnit
         assertEquals("[CODE, SUBCODE, DATABASE_INSTANCE, SPACE, SAMPLE_IDENTIFIER, SAMPLE_TYPE, "
                 + "IS_INSTANCE_SAMPLE, IS_INVALID, REGISTRATOR, REGISTRATION_DATE, "
                 + "EXPERIMENT, EXPERIMENT_IDENTIFIER, PROJECT, "
-                + "PERM_ID, SHOW_DETAILS_LINK_COLUMN_NAME, PARENTS, CONTAINER_SAMPLE, "
+                + "PERM_ID, SHOW_DETAILS_LINK, generatedFromParent, containerParent, "
                 + "property-USER-NAME]", getHeaderIDs(tableModel).toString());
         assertEquals("[VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, "
                 + "VARCHAR, VARCHAR, VARCHAR, TIMESTAMP, VARCHAR, VARCHAR, VARCHAR, "