SSDM-10010: bug fixed: Uploading a data set in ELN cause the deletion of...

SSDM-10010: bug fixed: Uploading a data set in ELN cause the deletion of property of data type sample

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricher.java

@@ -269,6 +269,7 @@ public final class EntityPropertiesEnricher implements IEntityPropertiesEnricher
                 sample.setCode(record.code);
                 sample.setSampleType(sampleTypes.get(record.saty_id));
                 sample.setId(record.id);
+                sample.setPermId(record.perm_id);
                 map.put(record.id, sample);
             }
         }

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IPropertyListingQuery.java

@@ -66,7 +66,7 @@ public interface IPropertyListingQuery
             parameterBindings = { LongSetMapper.class}, fetchSize = FETCH_SIZE)
     public DataIterator<MaterialEntityPropertyRecord> getMaterials(LongSet materialIds);
     
-    @Select(sql = "SELECT id, code, saty_id FROM samples WHERE id = any(?{1})", 
+    @Select(sql = "SELECT id, code, perm_id, saty_id FROM samples WHERE id = any(?{1})", 
             parameterBindings = { LongSetMapper.class}, fetchSize = FETCH_SIZE)
     public DataIterator<SampleEntityPropertyRecord> getBasicSamples(LongSet sampleIds);
     

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/SampleEntityPropertyRecord.java

@@ -10,4 +10,6 @@ public class SampleEntityPropertyRecord
     public long saty_id;
 
     public String code;
+
+    public String perm_id;
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractEntityProperty.java

@@ -70,6 +70,9 @@ public abstract class AbstractEntityProperty implements IEntityProperty
                 Material material = getMaterial();
                 return (material != null) ? MaterialIdentifier.print(material.getCode(), material
                         .getMaterialType().getCode()) : getValue();
+            case SAMPLE:
+                Sample sample = getSample();
+                return (sample != null) ? sample.getPermId() : getValue();
             default:
                 return getValue();
         }