From 4516c05e0d92d85f2a035787a0115b023353b58c Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Thu, 2 Mar 2017 14:40:51 +0000
Subject: [PATCH] SSDM-4832 : bugfix, when delete dataset, refresh menu and
view correctly
SVN: 37855
---
.../DataSetForm/DataSetFormController.js | 24 +++++++++++++++----
.../js/views/DataSetForm/DataSetFormView.js | 1 -
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
index 9252de9b849..af79dff9a9a 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
@@ -58,16 +58,30 @@ function DataSetFormController(parentController, mode, entity, dataSet, isMini)
this.deleteDataSet = function(reason) {
var _this = this;
+ Util.blockUI();
mainController.serverFacade.deleteDataSets([this._dataSetFormModel.dataSet.code], reason, function(data) {
if(data.error) {
Util.showError(data.error.message);
} else {
Util.showSuccess("Data Set Deleted");
- if(this._dataSetFormModel.isExperiment()) {
- mainController.changeView('showExperimentPageFromIdentifier', _this._dataSetFormModel.entity.identifier.identifier);
- } else {
- mainController.changeView('showViewSamplePageFromPermId', _this._dataSetFormModel.entity.permId);
- }
+
+// setTimeout(function() { //Give some time to update the index
+ var space = null;
+ if(_this._dataSetFormModel.isExperiment()) {
+ mainController.changeView('showExperimentPageFromIdentifier', _this._dataSetFormModel.entity.identifier.identifier);
+ experimentIdentifier = _this._dataSetFormModel.entity.identifier.identifier;
+ space = experimentIdentifier.split("/")[1];
+ } else {
+ mainController.changeView('showViewSamplePageFromPermId', _this._dataSetFormModel.entity.permId);
+ sampleIdentifier = _this._dataSetFormModel.entity.identifier;
+ space = sampleIdentifier.split("/")[1];
+ }
+
+ var isInventory = profile.isInventorySpace(space);
+ if(!isInventory) {
+ mainController.sideMenu.refreshNodeParent(_this._dataSetFormModel.dataSet.code);
+ }
+// }, 3000);
}
});
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
index 43b8dc5caa6..2c8be87bc9d 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
@@ -81,7 +81,6 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
//Delete Button
var $deleteBtn = FormUtil.getDeleteButton(function(reason) {
_this._dataSetFormController.deleteDataSet(reason);
- mainController.sideMenu.deleteNodeByEntityPermId(_this._dataSetFormModel.dataSet.code, true);
}, true);
toolbarModel.push({ component : $deleteBtn, tooltip: "Delete" });
--
GitLab