LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(fix) don't show a dialog on top of a dialog for acl confirmation

pull/95/merge
Ludovic Marcotte 2015-08-05 20:23:11 -04:00
parent 5e19a889c2
commit 2f122f12b6
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
UI/Templates/UIxAclEditor.wox
View File

@ -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>

7
UI/WebServerResources/js/Common/AclController.js
View File

@ -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;
}
}