From 7055d86d48f6c5336c5ddf6484a85ce41a6dfde1 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 24 Mar 2017 14:41:55 +0000
Subject: [PATCH] SSDM-3501 : Trashcan view header
SVN: 37960
---
.../eln-lims/html/js/controllers/MainController.js | 4 ++--
.../html/js/views/TrashManager/TrashManagerController.js | 4 ++--
.../html/js/views/TrashManager/TrashManagerView.js | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
index 5ff49e666d9..e00eaefa8a5 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
@@ -745,8 +745,8 @@ function MainController(profile) {
this._showTrashcan = function() {
var trashcanController = new TrashManagerController(this);
this.trashcanController = trashcanController;
- var content = this._getBackwardsCompatibleMainContainer();
- trashcanController.init(content);
+ var views = this._getNewViewModel(true, true, false);
+ trashcanController.init(views);
}
this._showViewSamplePage = function(sample, isELNSubExperiment) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerController.js
index ef89627675b..0812adfb81d 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerController.js
@@ -47,13 +47,13 @@ function TrashManagerController(mainController) {
});
}
- this.init = function($container) {
+ this.init = function(views) {
var _this = this;
mainController.serverFacade.listDeletions(function(data) {
if(data.result && data.result.length > 0) {
_this._trashManagerModel.deletions = data.result;
}
- _this._trashManagerView.repaint($container);
+ _this._trashManagerView.repaint(views);
});
}
}
\ No newline at end of file
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerView.js
index c92ff6e8003..39431e1a560 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerView.js
@@ -20,9 +20,10 @@ function TrashManagerView(trashManagerController, trashManagerModel) {
var deleteMessageOne = "The selected entity in the trashcan will be deleted permanently. This action cannot be undone!<br><br>Are you sure you want to continue?";
var deleteMessageMany = "All entities in the trashcan will be deleted permanently. This action cannot be undone!<br><br>Are you sure you want to continue?";
- this.repaint = function($container) {
+ this.repaint = function(views) {
+ var $header = views.header;
+ var $container = views.content;
var _this = this;
- $container.empty();
//
// Form template and title
@@ -34,8 +35,7 @@ function TrashManagerView(trashManagerController, trashManagerModel) {
"onsubmit" : ""
});
- var $trashIcon = $("<span>", { 'class' : 'glyphicon glyphicon-trash'});
- $containerColumn.append($("<h1>").append($trashIcon).append(" Trashcan"));
+ $header.append($("<h1>").append("Trashcan"));
//
// Table
--
GitLab