From ee53e09c99e51e474d44141432ae9deb6d7d793b Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 13 Dec 2016 14:46:40 +0000
Subject: [PATCH] SSDM-4454 : MULTILINE_VARCHAR fields can now be configured to
be forced to plain text
SVN: 37488
---
.../eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js | 2 +-
.../eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
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 388bc19b4b4..376d581efb2 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
@@ -114,7 +114,7 @@ $.extend(DefaultProfile.prototype, {
this.isAdmin = false;
- this.forcedDisableRTF = ["NAME", "SEQUENCE"];
+ this.forcedDisableRTF = ["FREEFORM_TABLE_STATE","NAME", "SEQUENCE"];
this.isForcedDisableRTF = function(propertytype) {
return (propertytype && $.inArray(propertytype.code, this.forcedDisableRTF) !== -1);
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
index 7834d7afb9b..d2662138b44 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
@@ -134,9 +134,11 @@ def getProperties(tr, parameters):
properties = infService.listPropertyTypes(sessionToken, False);
return properties
+rtpropertiesToIgnore = ["FREEFORM_TABLE_STATE", "NAME", "SEQUENCE"];
+
def isPropertyRichText(properties, propertyCode):
for property in properties:
- if property.getCode() == propertyCode and property.getCode() != "FREEFORM_TABLE_STATE":
+ if property.getCode() == propertyCode and property.getCode() not in rtpropertiesToIgnore:
return property.getDataType() == DataTypeCode.MULTILINE_VARCHAR;
return None;
--
GitLab