Deliver centralized role management feature

[portal.git] / ecomp-portal-FE-common / client / app / views / users / new-user-dialogs / bulk-user.controller.js

diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js
index e73fe29..1e16995 100644 (file)
--- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js
@@ -23,7 +23,7 @@
 'use strict';
 (function () {
     class BulkUserModalCtrl {
-       constructor($scope, $log, $filter, $q, usersService, applicationsService, confirmBoxService, functionalMenuService, ngDialog) {
+       constructor($scope, $log, $filter, $q, usersService, applicationsService, confirmBoxService, functionalMenuService, ngDialog,$modal) {
                
                // Set to true for copious console output
                var debug = false;
@@ -340,7 +340,7 @@
                                if (prevRow == null || prevRow.orgUserId.toLowerCase() !== uploadRow.orgUserId.toLowerCase()) {
                                 if (debug)
                                         $log.debug('BulkUserModalCtrl::buildAppRoleChecks: create request for orgUserId ' + uploadRow.orgUserId);
-                                let appPromise = usersService.getUserAppRoles(appId, uploadRow.orgUserId).promise().then( (userAppRolesResult) => {
+                                let appPromise = usersService.getUserAppRoles(appId, uploadRow.orgUserId,true).promise().then( (userAppRolesResult) => {
                                         // Reply for unknown user has all defined roles with isApplied=false on each.  
                                         if (typeof userAppRolesResult[0] !== "undefined") {
                                                 if (debug)
@@ -486,10 +486,13 @@
                // Start the process
                $scope.readValidateFile();
                // Dialog shows progress
-               ngDialog.open({
-                       templateUrl: 'app/views/users/new-user-dialogs/bulk-user.confirm.html',
-                       scope: $scope
-               });
+               $modal.open({
+                       templateUrl: 'app/views/users/new-user-dialogs/bulk-user.confirm.html',
+                    controller: '',
+                    sizeClass: 'modal-medium', 
+                    resolve:'',
+                    scope: $scope
+                })
              };
 
              // Invoked by the Cancel button on the confirmation dialog.
@@ -500,7 +503,7 @@
              init();
        } // constructor
     } // class
-    BulkUserModalCtrl.$inject = ['$scope', '$log', '$filter', '$q', 'usersService', 'applicationsService', 'confirmBoxService', 'functionalMenuService', 'ngDialog'];    
+    BulkUserModalCtrl.$inject = ['$scope', '$log', '$filter', '$q', 'usersService', 'applicationsService', 'confirmBoxService', 'functionalMenuService', 'ngDialog','$modal'];    
     angular.module('ecompApp').controller('BulkUserModalCtrl', BulkUserModalCtrl);
 
     angular.module('ecompApp').directive('fileChange', ['$parse', function($parse){