From db38a28453ad04052aa0b6bc42af687c8f29c93e Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 20 Mar 2015 16:00:58 +0000
Subject: [PATCH] SSDM-1614 : YEASTLAB - ELN UI - Show Names (ANNOTATIONS_STATE
Bugfix for Show view)
SVN: 33702
---
.../html/js/views/legacy/SampleLinksWidget.js | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/legacy/SampleLinksWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/legacy/SampleLinksWidget.js
index 6ae56dbaeb2..540f5310a44 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/legacy/SampleLinksWidget.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/legacy/SampleLinksWidget.js
@@ -80,7 +80,7 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType
xmlDoc += "</root>";
-// $("#ANNOTATIONS_STATE").val(xmlDoc);
+ $("#ANNOTATIONS_STATE").val(xmlDoc);
//Compatibility mode for refactored sample form
if(mainController.currentView._sampleFormModel) {
@@ -579,13 +579,16 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType
item.children()[0].checked = sampleState[propertyTypeCode] === "true";
} else {
item.val(sampleState[propertyTypeCode]);
- if(this.isDisabled) {
- item.after(sampleState[propertyTypeCode]);
- item.hide();
- }
+ }
+
+ if(this.isDisabled) {
+ item.after(sampleState[propertyTypeCode]);
}
}
- if(!this.isDisabled) {
+
+ if(this.isDisabled && propertyTypeCode) {
+ item.hide();
+ } else if(!this.isDisabled) {
item.prop("disabled", false);
}
}
--
GitLab