diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js index d662e829df234724be5d2a5adea5f063223216b3..2a5a4c7ed2fad33bf56cc0b1bdc6c4376d9c1619 100644 --- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js +++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js @@ -2411,6 +2411,17 @@ var FormUtil = new function() { } } + this.renderArrayGridValue = function(params) { + if(!params.value || params.value === null){ + return "" + }else{ + if(Array.isArray(params.value)) { + return params.value.toString(); + } + return String(params.value) + } + } + this.renderMultilineVarcharGridValue = function(row, params, propertyType){ return this.renderCustomWidgetGridValue(row, params, propertyType) } diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js index e067afb67cfea30376ad4b3ff5e016a8f3715073..7da603d689f8106c837576ca9711a706f1e448b8 100644 --- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js +++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js @@ -1236,7 +1236,14 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) { return function(params){ return FormUtil.renderVocabularyGridFilter(params, propertyType.vocabulary); } - })(propertyType) + })(propertyType); + renderValue = function(row, params){ + return FormUtil.renderArrayGridValue(params); + }; + } else if(propertyType.dataType === "SAMPLE"){ + renderValue = function(row, params){ + return FormUtil.renderArrayGridValue(params); + }; } else if (propertyType.dataType === "DATE" || propertyType.dataType === "TIMESTAMP") { renderFilter = (function(propertyType){ return function(params) {