diff options
author | 2017-08-23 18:27:19 -0400 | |
---|---|---|
committer | 2017-08-23 21:12:56 -0400 | |
commit | 978dbcf0a196acbafad72fe1e2478ec0e384f02f (patch) | |
tree | 17e1ceaa4a12a599320cbb317947e990bf1a5383 /ecomp-portal-FE-common/client/app/views/admins/admins.controller.js | |
parent | bc7350dce5b7b1dcd1c472a3922b42c4ea99809d (diff) |
Deliver centralized role management feature
Repair multiple defects also.
Revise deployment to use docker-compose.
Remove all zip archives.
Issue: PORTAL-21, PORTAL-25, PORTAL-28, PORTAL-52, PORTAL-69,
PORTAL-74, PORTAL-76, PORTAL-80, PORTAL-82
Change-Id: Ie72fec7d35ba78beb162bba6ed27b2caee340c61
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-portal-FE-common/client/app/views/admins/admins.controller.js')
-rw-r--r-- | ecomp-portal-FE-common/client/app/views/admins/admins.controller.js | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/ecomp-portal-FE-common/client/app/views/admins/admins.controller.js b/ecomp-portal-FE-common/client/app/views/admins/admins.controller.js index 05f9db3b..28144ed7 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/admins.controller.js +++ b/ecomp-portal-FE-common/client/app/views/admins/admins.controller.js @@ -20,7 +20,7 @@ 'use strict'; (function () { class AdminsCtrl { - constructor($log, adminsService, applicationsService, ngDialog) { + constructor($log, adminsService, applicationsService, ngDialog, $modal) { let allPortalsFilterObject = {index: 0, title: 'All applications', value: ''}; @@ -119,43 +119,23 @@ } } } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/admins/add-admin-dialogs/new-admin.modal.html', - controller: 'NewAdminModalCtrl', - controllerAs: 'newAdmin', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ - // $log.debug('AdminsCtrl:openAddNewAdminModal:: updating table data...'); - updateTableData(); - } + controller: 'NewAdminModalCtrl as newAdmin', + sizeClass: 'modal-medium', + resolve: { + items: function () { + return data; + } + } }); + + modalInstance.result.finally(function () { + updateTableData(); + }); }; - - this.openEditUserModal = (loginId) => { - var data = { - loginId : loginId, - updateRemoteApp : false, - appId : this.selectedApp!=null?this.selectedApp.id:'' - } - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/header/user-edit/edit-user.tpl.html', - controller: 'editUserController', - data: data, - resolve: { - message: function message() { - var message = { - type: 'Contact', - }; - return message; - } - } - }).closePromise.then(needUpdate => { - updateTableData(); - }); - } } } - AdminsCtrl.$inject = ['$log', 'adminsService', 'applicationsService', 'ngDialog']; + AdminsCtrl.$inject = ['$log', 'adminsService', 'applicationsService', 'ngDialog', '$modal']; angular.module('ecompApp').controller('AdminsCtrl', AdminsCtrl); })(); |