Skip to content
Snippets Groups Projects
Commit e3a4c53b authored by juanf's avatar juanf
Browse files

SSDM-13446: Bug introduced by the merging of xls master data dbs

parent 4b1262d3
No related branches found
Tags S392.0
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
Hide whitespace changes
Inline Side-by-side
server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyAssignmentImportHelper.java
+ 1
− 1
View file @ e3a4c53b
...@@ -121,7 +121,7 @@ public class PropertyAssignmentImportHelper extends BasicImportHelper ...@@ -121,7 +121,7 @@ public class PropertyAssignmentImportHelper extends BasicImportHelper
String newVersion = getValueByColumnName(header, values, PropertyAssignmentImportHelper.Attribute.Version); String newVersion = getValueByColumnName(header, values, PropertyAssignmentImportHelper.Attribute.Version);
String code = getValueByColumnName(header, values, PropertyAssignmentImportHelper.Attribute.Code); String code = getValueByColumnName(header, values, PropertyAssignmentImportHelper.Attribute.Code);
return VersionUtils.isNewVersion(newVersion, VersionUtils.getStoredVersion(beforeVersions, ImportTypes.PROPERTY_TYPE.getType(), code)); return !existingCodes.contains(code) || VersionUtils.isNewVersion(newVersion, VersionUtils.getStoredVersion(beforeVersions, ImportTypes.PROPERTY_TYPE.getType(), code));
} }
@Override protected boolean isObjectExist(Map<String, Integer> header, List<String> values) @Override protected boolean isObjectExist(Map<String, Integer> header, List<String> values)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment