Updates

2018-11-27 12:25:11 -06:00
parent e54d4269c1
commit 0c41815601
3 changed files with 13 additions and 4 deletions
--- a/app/assets/javascripts/app/services/privilegesManager.js
+++ b/app/assets/javascripts/app/services/privilegesManager.js
@@ -30,9 +30,9 @@ class PrivilegesManager {
    PrivilegesManager.SessionLengthOneWeek = 604800;

    this.availableActions = [
+      PrivilegesManager.ActionManagePrivileges,
      PrivilegesManager.ActionManageExtensions,
      PrivilegesManager.ActionManageBackups,
-      PrivilegesManager.ActionManagePrivileges,
      PrivilegesManager.ActionManagePasscode,
      PrivilegesManager.ActionViewLockedNotes,
      PrivilegesManager.ActionDeleteNote
@@ -61,6 +61,10 @@ class PrivilegesManager {
  }

  presentPrivilegesModal(action, onSuccess, onCancel) {
+    if(this.authenticationInProgress()) {
+      onCancel && onCancel();
+      return;
+    }

    let customSuccess = () => {
      onSuccess && onSuccess();