From 978dbcf0a196acbafad72fe1e2478ec0e384f02f Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Wed, 23 Aug 2017 18:27:19 -0400
Subject: 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>
---
 .../views/portal-admin/portal-admin-controller.js  | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js')

diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js b/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js
index 89f6d0ae..de1557a9 100644
--- a/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js
+++ b/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js
@@ -20,7 +20,7 @@
 'use strict';
 (function () {
     class PortalAdminsCtrl {
-        constructor($log, portalAdminsService, ngDialog, confirmBoxService) {
+        constructor($log, portalAdminsService, ngDialog, confirmBoxService, $modal) {
 
             let updateTableData = () => {
                 this.isLoadingTable = true;
@@ -91,20 +91,22 @@
                         }
                     }
                 }
-                ngDialog.open({
+                
+                var modalInstance = $modal.open({
                     templateUrl: 'app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html',
-                    controller: 'NewPortalAdminModalCtrl',
-                    controllerAs: 'newPortalAdmin',
+                    controller: 'NewPortalAdminModalCtrl as newPortalAdmin',
+                    sizeClass: 'modal-medium',
                     data: data
-                }).closePromise.then(needUpdate => {
-                    if(needUpdate.value === true){
-                        $log.debug('PortalAdminsCtrl::openAddNewPortalAdminModal: updating Portal Admin table data...');
-                        updateTableData();
-                    }
-                });
+                })
+                
+                modalInstance.result.finally(function () {
+                	$log.debug('PortalAdminsCtrl::openAddNewPortalAdminModal: updating Portal Admin table data...');         
+                    updateTableData();
+     	        });
+                
             };
         }
     }
-    PortalAdminsCtrl.$inject = ['$log', 'portalAdminsService', 'ngDialog', 'confirmBoxService'];
+    PortalAdminsCtrl.$inject = ['$log', 'portalAdminsService', 'ngDialog', 'confirmBoxService', '$modal'];
     angular.module('ecompApp').controller('PortalAdminsCtrl', PortalAdminsCtrl);
 })();
-- 
cgit 1.2.3-korg