Fixed multiple popup issue for delete user task

Bugzilla: 1610668 tendrl-bug-id: Tendrl#1076
gnehapk · Oct 16, 2018 · 3197ac4 · 3197ac4
1 parent fa41bbf
commit 3197ac4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 22 deletions.
diff --git a/src/modules/users/user-list/users.html b/src/modules/users/user-list/users.html
@@ -72,20 +72,13 @@ <h1>No Users Detected</h1>
                                 <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                                     <span class="fa fa-ellipsis-v"></span>
                                 </button>
-                                <pf-modal-overlay 
-                                    show-modal="userCntrl.showDeleteUserModal" 
-                                    on-close="userCntrl.closeDeleteUserModal(dismissCause)" 
-                                    modal-id="userCntrl.deleteUserModalId" 
-                                    modal-title="userCntrl.deleteUserModalTitle" 
-                                    modal-body-template="userCntrl.deleteUserModalTemplate" 
-                                    action-buttons="userCntrl.deleteUserModalActionButtons" 
-                                    modal-body-scope="userCntrl.deleteUser">
+                                <pf-modal-overlay show-modal="user.showDeleteUserModal" on-close="userCntrl.closeDeleteUserModal(user)" modal-id="userCntrl.deleteUserModalId" modal-title="userCntrl.deleteUserModalTitle" modal-body-template="userCntrl.deleteUserModalTemplate" action-buttons="userCntrl.deleteUserModalActionButtons" modal-body-scope="userCntrl.deleteUser">
                                 </pf-modal-overlay>
                                 <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownKebabRight">
                                     <!-- <li ng-if="(user.status | lowercase) == 'enabled'"><a href="#">Disable User</a></li>
                                 <li ng-if="(user.status | lowercase) == 'disabled'"><a href="#">Enable User</a></li> -->
                                     <li><a ng-click="userCntrl.toggleNotification(user)">{{ user.notification === true ? 'Disable' : 'Enable' }} Email Notification</a></li>
-                                    <li ng-if="user.role !== 'admin'"><a ng-click="userCntrl.deleteUser(user.username)">Delete User</a></li>
+                                    <li ng-if="user.role !== 'admin'"><a ng-click="userCntrl.deleteUser(user)">Delete User</a></li>
                                 </ul>
                             </div>
                         </td>
@@ -94,4 +87,4 @@ <h1>No Users Detected</h1>
             </table>
         </div>
     </div>
-</div>
+</div>
diff --git a/src/modules/users/user-list/users.js b/src/modules/users/user-list/users.js
@@ -52,7 +52,6 @@
         };
 
         /*BEGIN Delete User modal*/
-        vm.showDeleteUserModal = false;
         vm.deleteUser = deleteUser;
         vm.closeDeleteUserModal = closeDeleteUserModal;
         vm.deleteUserModalTitle = "Delete User";
@@ -65,34 +64,35 @@
             label: "Delete",
             class: "btn-danger custom-class",
             actionFn: function() {
-                userStore.deleteUser(vm.deleteUser.username)
+                userStore.deleteUser(vm.userToDelete.username)
                     .then(function(data) {
-                        vm.showDeleteUserModal = false;
+                        vm.userToDelete.showDeleteUserModal = false;
                         userStore.getUserList()
                             .then(function(data) {
                                 if (data !== null) {
                                     $rootScope.$broadcast("UpdatedUserList", data);
                                 }
-                                Notifications.message("success", "", vm.deleteUser.username + " deleted Successfully.");
+                                Notifications.message("success", "", vm.userToDelete.username + " deleted successfully.");
                             });
 
                     }).catch(function(e) {
-                        vm.showDeleteUserModal = false;
-                        Notifications.message("danger", "", "Error deleting " + vm.deleteUser.username);
+                        vm.userToDelete.showDeleteUserModal = false;
+                        Notifications.message("danger", "", "Error in deleting " + vm.userToDelete.username);
                     });
 
             }
 
         }];
 
-        function deleteUser(username) {
-            vm.showDeleteUserModal = true;
-            vm.deleteUser = {};
-            vm.deleteUser.username = username;
+        function deleteUser(user) {
+
+            user.showDeleteUserModal = true;
+            vm.userToDelete = {};
+            vm.userToDelete = user;
         }
 
-        function closeDeleteUserModal(dismissCause) {
-            vm.showDeleteUserModal = false;
+        function closeDeleteUserModal(user) {
+            user.showDeleteUserModal = false;
         }
         /*END Delete User modal*/