From 9e8c000e19e085656ab6bcdae1c7d7d9d8e447de Mon Sep 17 00:00:00 2001
From: juanf <juanf@bsse-bs-dock-dhcp-015.ethz.ch>
Date: Tue, 27 Mar 2018 15:26:01 +0200
Subject: [PATCH] SSDM-6378 : Bugfix, show error message when deletes fail
---
.../html/js/views/SampleForm/SampleFormController.js | 8 ++++++--
1 file changed, 6 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 e614a21186b..e9db5ffec7b 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
@@ -420,8 +420,12 @@ function SampleFormController(mainController, mode, sample, paginationInfo) {
if(samplesToDelete) {
mainController.serverFacade.deleteSamples(samplesToDelete, "Deleted to trashcan from eln sample form " + _this._sampleFormModel.sample.identifier,
- function() {
- Util.showSuccess(message, callbackOk);
+ function(response) {
+ if(response.error) {
+ Util.showError("Deletes failed, other changes where commited: " + response.error.message, callbackOk);
+ } else {
+ Util.showSuccess(message, callbackOk);
+ }
_this._sampleFormModel.isFormDirty = false;
},
false);
--
GitLab