diff options
author | Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-23 18:27:19 -0400 |
---|---|---|
committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-23 21:12:56 -0400 |
commit | 978dbcf0a196acbafad72fe1e2478ec0e384f02f (patch) | |
tree | 17e1ceaa4a12a599320cbb317947e990bf1a5383 /ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.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-os/client/src/views/functionalMenu/functionalMenu.controller.js')
-rw-r--r-- | ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js | 52 |
1 files changed, 33 insertions, 19 deletions
diff --git a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js index 343c968d..0ff46e4d 100644 --- a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js +++ b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js @@ -20,7 +20,7 @@ 'use strict'; (function () { class FunctionalMenuCtrl { - constructor($log, functionalMenuService, $scope,ngDialog, confirmBoxService) { + constructor($log, functionalMenuService, $scope,ngDialog, confirmBoxService,$modal) { $log.info('FunctionalMenuCtrl init'); $scope.invokeDialog = () => { @@ -145,19 +145,26 @@ title: getDialogTitle(source) }; } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html', - controller: 'MenuDetailsModalCtrl', - controllerAs: 'functionalMenuDetails', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ - $log.debug('FunctionalMenuCtrl::openMenuDetailsModal: updating table data...'); + controller: 'MenuDetailsModalCtrl as functionalMenuDetails', + sizeClass: 'modal-large', + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.finally(function (needUpdate){ + if(needUpdate.value === true){ + $log.debug('FunctionalMenuCtrl::openMenuDetailsModal: updating table data...'); if(source==="edit") { init(); } - } - }); + + } + }); }); }; @@ -191,18 +198,25 @@ }; } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html', - controller: 'MenuDetailsModalCtrl', - controllerAs: 'functionalMenuDetails', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ + controller: 'MenuDetailsModalCtrl as functionalMenuDetails', + sizeClass: 'modal-large', + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.finally(function (needUpdate){ + if(needUpdate.value === true){ $log.debug('FunctionalMenuCtrl::getMenuDetails: updating table data...'); init(); //getOnboardingWidgets(); - } - }); + + } + }); } }); }; @@ -238,7 +252,7 @@ init(); } } - FunctionalMenuCtrl.$inject = ['$log', 'functionalMenuService','$scope', 'ngDialog', 'confirmBoxService']; + FunctionalMenuCtrl.$inject = ['$log', 'functionalMenuService','$scope', 'ngDialog', 'confirmBoxService','$modal']; angular.module('ecompApp').controller('FunctionalMenuCtrl', FunctionalMenuCtrl); angular.module('ecompApp').directive('jqTree', ['functionalMenuService','$log','confirmBoxService',function(functionalMenuService,$log,confirmBoxService){ |