From 82b551aa1924f8d6ca5ef0109b01b4e2d6190552 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 24 Mar 2017 14:36:33 +0000
Subject: [PATCH] SSDM-3501 : User manager view header
SVN: 37959
---
.../eln-lims/html/js/controllers/MainController.js | 4 ++--
.../html/js/views/UserManager/UserManagerController.js | 4 ++--
.../eln-lims/html/js/views/UserManager/UserManagerView.js | 8 +++++---
3 files changed, 9 insertions(+), 7 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 8241000440d..5ff49e666d9 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
@@ -669,10 +669,10 @@ function MainController(profile) {
}
this._showUserManager = function() {
- var content = this._getBackwardsCompatibleMainContainer();
+ var views = this._getNewViewModel(true, true, false);
var userManagerController = new UserManagerController(this);
- userManagerController.init(content);
+ userManagerController.init(views);
this.currentView = userManagerController;
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerController.js
index 33dd2b2ad04..6f76614ea94 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerController.js
@@ -19,13 +19,13 @@ function UserManagerController(mainController) {
this._userManagerModel = new UserManagerModel();
this._userManagerView = new UserManagerView(this, this._userManagerModel);
- this.init = function($container) {
+ this.init = function(views) {
var _this = this;
mainController.serverFacade.listPersons(function(data) {
if(data.result && data.result.length > 0) {
_this._userManagerModel.persons = data.result;
}
- _this._userManagerView.repaint($container);
+ _this._userManagerView.repaint(views);
});
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerView.js
index 386ce50e1c7..c4abece555f 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerView.js
@@ -18,7 +18,9 @@ function UserManagerView(userManagerController, userManagerModel) {
this._userManagerController = userManagerController;
this._userManagerModel = userManagerModel;
- this.repaint = function($container) {
+ this.repaint = function(views) {
+ var $header = views.header;
+ var $container = views.content;
$container.empty();
//
@@ -31,14 +33,14 @@ function UserManagerView(userManagerController, userManagerModel) {
"onsubmit" : ""
});
- $containerColumn.append($("<h1>").append(" User Manager"));
+ $header.append($("<h1>").append("User Manager"));
//
// ToolBox
//
var $toolbox = $("<div>", { 'id' : 'toolBoxContainer', class : 'toolBox'});
$toolbox.append(this._getOptionsMenu());
- $containerColumn.append($toolbox);
+ $header.append($toolbox);
//
// Data Grid
--
GitLab