From cfe7446af72c5f404c4d035fe67e3d51b24a9364 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 19 May 2015 11:43:10 +0000
Subject: [PATCH] SSDM-1865 : Polished warning messages.
SVN: 33992
---
.../eln-lims/html/js/views/SampleForm/SampleFormView.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
index 462a6c0dcc3..bde8e78bdaf 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
@@ -69,9 +69,9 @@ function SampleFormView(sampleFormController, sampleFormModel) {
//Delete
var warningText = null;
if(this._sampleFormModel.sample.children.length > 0 || this._sampleFormModel.datasets.length > 0) {
- warningText = 'Are you sure you want to delete this sample? The next relationships will be broken but the entities will remain.'
+ warningText = ''
if(this._sampleFormModel.sample.children.length > 0) {
- warningText += "\n- The sample has " + this._sampleFormModel.sample.children.length + " children samples:";
+ warningText += "\n- The sample has " + this._sampleFormModel.sample.children.length + " children samples, these relationships will be broken but the children will remain:";
var numChildrenToShow = this._sampleFormModel.sample.children.length;
if(numChildrenToShow > 10) {
numChildrenToShow = 10;
@@ -84,7 +84,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
}
}
if(this._sampleFormModel.datasets.length > 0) {
- warningText += "\n- The sample has " + this._sampleFormModel.datasets.length + " datasets:";
+ warningText += "\n- The sample has " + this._sampleFormModel.datasets.length + " datasets, these will be deleted with the sample:";
var numDatasetsToShow = this._sampleFormModel.datasets.length;
if(numDatasetsToShow > 10) {
numDatasetsToShow = 10;
--
GitLab