From 2f122f12b6bc9b0ad0cc0969cc5ba0f5eef23a8b Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 5 Aug 2015 20:23:11 -0400
Subject: [PATCH] (fix) don't show a dialog on top of a dialog for acl
 confirmation

---
 UI/Templates/UIxAclEditor.wox                    | 11 ++++++++++-
 UI/WebServerResources/js/Common/AclController.js |  7 ++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index 5690e603d..4a40367d2 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -67,7 +67,7 @@
       </md-card>
     </md-dialog-content>
 
-    <div class="md-actions">
+    <div ng-hide="acl.confirmation.showing" class="md-actions">
       <md-autocomplete
           class="md-flex"
           md-input-name="addUser"
@@ -93,6 +93,15 @@
       </md-autocomplete>
       <md-button ng-click="acl.saveModal()"><var:string label:value="Save"/></md-button>
     </div>
+    <div class="md-actions" ng-show="acl.confirmation.showing">
+      <span>{{acl.confirmation.message}}</span>
+      <md-button ng-click="acl.selectedUser.$resetRights(true); acl.confirmation.showing = false">
+        <var:string label:value="Cancel"/>
+      </md-button>
+      <md-button class="md-warn" ng-click="acl.confirmation.showing = false">
+        <var:string label:value="Ok"/>
+      </md-button>
+    </div>
   </md-dialog>
 
 </container>
diff --git a/UI/WebServerResources/js/Common/AclController.js b/UI/WebServerResources/js/Common/AclController.js
index dd8c0112d..6239eb9d4 100644
--- a/UI/WebServerResources/js/Common/AclController.js
+++ b/UI/WebServerResources/js/Common/AclController.js
@@ -22,6 +22,8 @@
     vm.removeUser = removeUser;
     vm.addUser = addUser;
     vm.selectUser = selectUser;
+    vm.confirmation = { showing: false,
+                        message: ''};
 
     function userFilter($query) {
       return User.$filter($query, folder.$acl.users);
@@ -43,9 +45,8 @@
     function confirmChange(user) {
       var confirmation = user.$confirmRights();
       if (confirmation) {
-        Dialog.confirm(l('Warning'), confirmation).catch(function() {
-          user.$resetRights(true);
-        });
+        vm.confirmation.showing = true;
+        vm.confirmation.message = confirmation;
       }
     }