Skip to content
Snippets Groups Projects
Commit 6f8fd3e8 authored by Fuentes Serna  Juan Mariano (ID SIS)'s avatar Fuentes Serna Juan Mariano (ID SIS)
Browse files

SSDM-6169 : Hierarchical view, bugfixes to show rich text data properly and...

SSDM-6169 : Hierarchical view, bugfixes to show rich text data properly and don't show missing properties
parent c8c34d6a
No related branches found
No related tags found
No related merge requests found
......@@ -126,9 +126,14 @@ $.extend(DefaultProfile.prototype, {
// this.jupyterIntegrationServerEndpoint = "https://127.0.0.1:8123";
// this.jupyterEndpoint = "http://127.0.0.1:8000/";
this.systemProperties = ["ANNOTATIONS_STATE"];
this.forcedDisableRTF = ["FREEFORM_TABLE_STATE","NAME", "SEQUENCE"];
this.forceMonospaceFont = ["SEQUENCE"];
this.isSystemProperty = function(propertytype) {
return (propertytype && $.inArray(propertytype.code, this.systemProperties) !== -1);
}
this.isForcedMonospaceFont = function(propertytype) {
return (propertytype && $.inArray(propertytype.code, this.forceMonospaceFont) !== -1);
}
......
......@@ -80,13 +80,13 @@ var PrintUtil = new function() {
if(entity.sampleTypeCode) {
var href = Util.getURLFor(mainController.sideMenu.getCurrentNodeId(), "showViewSamplePageFromPermId", entity.permId);
var codeLink = $("<a>", { "href" : href, "class" : "browser-compatible-javascript-link" }).append(nameLabel);
var codeLink = $("<a>", { "href" : href, "class" : "browser-compatible-javascript-link" }).text(nameLabel);
codeLink.click(function() {
mainController.changeView("showViewSamplePageFromPermId", entity.permId);
});
$newInspector.append($("<strong>").append(codeLink));
} else {
$newInspector.append($("<strong>").append(nameLabel));
$newInspector.append($("<strong>").text(nameLabel));
}
}
......@@ -134,6 +134,9 @@ var PrintUtil = new function() {
} else {
propertyContent = entity.properties[propertyCode];
propertyContent = Util.getEmptyIfNull(propertyContent);
if(propertyType.dataType === "MULTILINE_VARCHAR") {
propertyContent = FormUtil.sanitizeRichHTMLText(propertyContent);
}
propertyContent = Util.replaceURLWithHTMLLinks(propertyContent);
}
......@@ -145,7 +148,7 @@ var PrintUtil = new function() {
propertyContent = propertyContent.replace(/\n/g, "<br />");
}
if(propertyContent !== "") {
if(propertyContent && !profile.isSystemProperty(propertyType)) { // Only show non empty properties
if(isSingleColumn) {
$newInspectorTable
.append($("<tr>")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment