diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js index 715945b2854f4b24204ac9dcbf5a935468107052..b47239423dd824d9cf416d133be1362132615cf0 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js @@ -118,7 +118,7 @@ $.extend(DefaultProfile.prototype, { // BigDataLink EDMs config this.EDMSs = { -// "EXAMPLE-BS-MBPR28.D.ETHZ.CH-E96954A7" : "http://localhost:8080/download" +// "ADMIN-BS-MBPR28.D.ETHZ.CH-E96954A7" : "http://localhost:8080/download" } // Jupyter integration config @@ -129,6 +129,12 @@ $.extend(DefaultProfile.prototype, { this.forcedDisableRTF = ["FREEFORM_TABLE_STATE","NAME", "SEQUENCE"]; this.forceMonospaceFont = ["SEQUENCE"]; + this.isRTF = function(propertytype) { + return (propertytype && + propertytype.dataType === "MULTILINE_VARCHAR" && + $.inArray(propertytype.code, this.forcedDisableRTF) === -1) + } + this.isSystemProperty = function(propertytype) { return (propertytype && $.inArray(propertytype.code, this.systemProperties) !== -1); } diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js index 36a712097a549bcd7fd0ca050a1cc227723bfac8..eb04915771893e6af437d1d8816c94e22e4311ac 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js @@ -144,7 +144,9 @@ var PrintUtil = new function() { var transformerResult = profile.inspectorContentTransformer(entity, propertyCode, propertyContent); isSingleColumn = transformerResult["isSingleColumn"]; propertyContent = transformerResult["content"]; - propertyContent = propertyContent.replace(/\n/g, "<br />"); + if(!profile.isRTF(propertyType)) { + propertyContent = propertyContent.replace(/\n/g, "<br />"); + } } if(propertyContent && !profile.isSystemProperty(propertyType)) { // Only show non empty properties