diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js index 192778a92e802f93f439dca4d86150bf51d402f9..cf22837c826e4e1ed4fabcfbdb97422b43fc4e7e 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js @@ -120,16 +120,21 @@ function SettingsManager(serverFacade) { } } - // sampleTypeDefinitionsExtension gets overwritten with settings if found - for (var sampleType of Object.keys(settings.sampleTypeDefinitionsExtension)) { - profile.sampleTypeDefinitionsExtension[sampleType] = settings.sampleTypeDefinitionsExtension[sampleType]; - // Add the types to hide == not show - if(!settings.sampleTypeDefinitionsExtension[sampleType].SHOW) { - targetProfile.hideTypes["sampleTypeCodes"].push(sampleType); - } else if($.inArray(sampleType, targetProfile.hideTypes["sampleTypeCodes"]) !== -1) { - var indexToRemove = $.inArray(sampleType, targetProfile.hideTypes); + + for (var sampleTypeCode of Object.keys(settings.sampleTypeDefinitionsExtension)) { + // sampleTypeDefinitionsExtension gets overwritten with settings if found + targetProfile.sampleTypeDefinitionsExtension[sampleTypeCode] = settings.sampleTypeDefinitionsExtension[sampleTypeCode]; + + // Remove current profile show config + if($.inArray(sampleTypeCode, targetProfile.hideTypes["sampleTypeCodes"]) !== -1) { + var indexToRemove = $.inArray(sampleTypeCode, targetProfile.hideTypes["sampleTypeCodes"]); targetProfile.hideTypes["sampleTypeCodes"] = targetProfile.hideTypes["sampleTypeCodes"].splice(indexToRemove, 1); } + + // Add current profile show config + if(!settings.sampleTypeDefinitionsExtension[sampleTypeCode].SHOW) { + targetProfile.hideTypes["sampleTypeCodes"].push(sampleTypeCode); + } } }