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>
---
 .../confirmation-box.controller.js                 | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

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

diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js
index 36eb04a8..ef553e23 100644
--- a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js
@@ -23,13 +23,13 @@
 'use strict';
 (function () {
     class ConfirmationBoxCtrl {
-        constructor($scope,$state) {
-
-            let init = () => {
-                let item = ($scope.ngDialogData && $scope.ngDialogData.item) || 'this';
-                this.message = $scope.ngDialogData.message ? $scope.ngDialogData.message : `Are you sure you want to delete "${item}"?`;
-                this.title = $scope.ngDialogData.title ? $scope.ngDialogData.title : '';
-            };
+        constructor($scope,$state,message,$modalInstance) {
+        	$scope.message = message;
+        	/*let init = () => {
+                let item = ($scope.message && $scope.message.item) || 'this';
+                message = $scope.message.content ? $scope.message.content : `Are you sure you want to delete "${message.item}"?`;
+                this.title = $scope.message.title ? $scope.message.title : '';
+            };*/
 
             this.closeBox = isConfirmed => {
                 $scope.closeThisDialog(isConfirmed);
@@ -40,10 +40,14 @@
             	$state.go(state,params);
             	
             };
+            
+            $scope.ok =function(confirm){
+            	$modalInstance.close(confirm);
+            }
 
-            init();
+          //  init();
         }
     }
-    ConfirmationBoxCtrl.$inject = ['$scope','$state'];
+    ConfirmationBoxCtrl.$inject = ['$scope','$state','message','$modalInstance'];
     angular.module('ecompApp').controller('ConfirmationBoxCtrl', ConfirmationBoxCtrl);
 })();
-- 
cgit 1.2.3-korg