From 120dcd45dbf2b8b3f2e02baf91b8d5054acc38db Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 19 Apr 2016 12:47:59 +0000
Subject: [PATCH] SSDM-3253 : Option to copy or not comment logs.
SVN: 36228
---
.../html/js/views/SampleForm/SampleFormController.js | 7 ++++++-
.../eln-lims/html/js/views/SampleForm/SampleFormView.js | 5 ++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
index 3f22bd10aab..46e2fe6b6cc 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
@@ -104,7 +104,7 @@ function SampleFormController(mainController, mode, sample) {
});
}
- this.createUpdateCopySample = function(isCopyWithNewCode, linkParentsOnCopy, copyChildrenOnCopy) {
+ this.createUpdateCopySample = function(isCopyWithNewCode, linkParentsOnCopy, copyChildrenOnCopy, copyCommentsLogOnCopy) {
Util.blockUI();
var _this = this;
@@ -232,6 +232,11 @@ function SampleFormController(mainController, mode, sample) {
parameters["sampleCode"] = isCopyWithNewCode;
parameters["notCopyProperties"] = [];
parameters["defaultBenchPropertyList"] = [];
+
+ if(!copyCommentsLogOnCopy && parameters["sampleProperties"]["XMLCOMMENTS"]) {
+ delete parameters["sampleProperties"]["XMLCOMMENTS"];
+ }
+
if(!linkParentsOnCopy) {
parameters["sampleParents"] = [];
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
index 9526758203c..ba5d68cfa44 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
@@ -623,6 +623,8 @@ function SampleFormView(sampleFormController, sampleFormModel) {
component += "<span class='checkbox'><label><input type='checkbox' id='linkParentsOnCopy'> Link Parents </label></span>";
component += " ";
component += "<span class='checkbox'><label><input type='checkbox' id='copyChildrenOnCopy'> Copy Children </label></span>";
+ component += " ";
+ component += "<span class='checkbox'><label><input type='checkbox' id='copyCommentsLogOnCopy'> Copy Comments Log </label></span>";
component += "</div>";
component += "</div>";
component += "</div>";
@@ -658,10 +660,11 @@ function SampleFormView(sampleFormController, sampleFormModel) {
var newSampleCodeForCopy = $("#newSampleCodeForCopy");
var linkParentsOnCopy = $("#linkParentsOnCopy")[0].checked;
var copyChildrenOnCopy = $("#copyChildrenOnCopy")[0].checked;
+ var copyCommentsLogOnCopy = $("#copyCommentsLogOnCopy")[0].checked;
var isValid = newSampleCodeForCopy[0].checkValidity();
if(isValid) {
var newSampleCodeForCopyValue = newSampleCodeForCopy.val();
- _this._sampleFormController.createUpdateCopySample(newSampleCodeForCopyValue, linkParentsOnCopy, copyChildrenOnCopy);
+ _this._sampleFormController.createUpdateCopySample(newSampleCodeForCopyValue, linkParentsOnCopy, copyChildrenOnCopy, copyCommentsLogOnCopy);
} else {
Util.showError("Invalid code.", function() {}, true);
}
--
GitLab