From be0b854fd237b32b8efe2b63405eb3e6c468ead1 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Wed, 6 Sep 2023 14:30:13 -0500
Subject: [PATCH 01/23] wip

---
 avAdmin/admin-directives/dashboard/dashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/avAdmin/admin-directives/dashboard/dashboard.js b/avAdmin/admin-directives/dashboard/dashboard.js
index 4bacdecb..70ab7778 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.js
+++ b/avAdmin/admin-directives/dashboard/dashboard.js
@@ -673,7 +673,7 @@ angular.module('avAdmin')
           .getEditPerm(scope.id)
           .then(
             function (perm) {
-              scope.perms.val = perm;
+              scope.perms.val = perm.split(":")[4].split("|");
             }
           );
         scope.publicURL = ConfigService.publicURL;

From bcc48a591e47d5af78650a7628a9267968a6be3e Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Wed, 6 Sep 2023 15:09:14 -0500
Subject: [PATCH 02/23] wip

---
 avAdmin/init.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/avAdmin/init.js b/avAdmin/init.js
index 98cd5d19..f869407f 100644
--- a/avAdmin/init.js
+++ b/avAdmin/init.js
@@ -17,6 +17,17 @@
 
 angular.module('avAdmin', ['ui.bootstrap','ui.utils','ui.router']);
 
-angular.module('avAdmin').config(function() {
+angular.module('avAdmin').config(function($scope, ElectionsApi) {
     /* Add New States Above */
+    var perms = {val: ""};
+    ElectionsApi
+        .getEditPerm(scope.id)
+        .then(
+        function (perm) {
+            perms.val = perm.split(":")[4].split("|");
+        }
+        );
+    angular.extend($scope, {
+        perms: perms
+    });
 });

From d301cb70ed06e97803d2aa2b9489c8ff5b986f2d Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Wed, 6 Sep 2023 15:31:18 -0500
Subject: [PATCH 03/23] wip

---
 avAdmin/admin-controller/admin-controller.js  | 20 +++++++++++++++----
 .../admin-directives/dashboard/dashboard.js   |  2 ++
 avAdmin/init.js                               | 14 +------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/avAdmin/admin-controller/admin-controller.js b/avAdmin/admin-controller/admin-controller.js
index 80fa0f26..0a3da48c 100644
--- a/avAdmin/admin-controller/admin-controller.js
+++ b/avAdmin/admin-controller/admin-controller.js
@@ -38,9 +38,6 @@ angular
       var id = $stateParams.id;
       $scope.electionId = id;
 
-      // get election perms, with a default of no perms
-      $scope.perms = {val: ""};
-
       $scope.state = $state.current.name;
       $scope.current = null;
       $scope.noplugin = true;
@@ -219,16 +216,31 @@ angular
       Plugins.hook('add-dashboard-election-states', plugins_data);
       states = states.concat(plugins_data.states);
 
+
+      // get election perms, with a default of no perms
+      $scope.perms = {val: ""};
+      ElectionsApi
+        .getEditPerm($scope.electionId)
+        .then(
+          function (perm) {
+            $scope.perms.val = perm.split(":")[4].split("|");
+          }
+        );
+
       $scope.globalPerms = {val: ""};
       // update global perms
       ElectionsApi
         .getEditPerm(null)
         .then(
           function (perm) {
-            $scope.globalPerms.val = perm;
+            $scope.globalPerms.val = perm.split(":")[4].split("|");
           }
         );
 
+      angular.extend($scope, {
+        perms: $scope.
+      })
+
       if (states.indexOf($scope.state) >= 0) {
           $scope.sidebarlinks = [];
           if (!!id)
diff --git a/avAdmin/admin-directives/dashboard/dashboard.js b/avAdmin/admin-directives/dashboard/dashboard.js
index 70ab7778..e5362627 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.js
+++ b/avAdmin/admin-directives/dashboard/dashboard.js
@@ -668,6 +668,7 @@ angular.module('avAdmin')
           $state.go("admin.basic");
         }
 
+        /*
         scope.perms = {val: ""};
         ElectionsApi
           .getEditPerm(scope.id)
@@ -676,6 +677,7 @@ angular.module('avAdmin')
               scope.perms.val = perm.split(":")[4].split("|");
             }
           );
+        */
         scope.publicURL = ConfigService.publicURL;
         scope.launchedTally = false;
         
diff --git a/avAdmin/init.js b/avAdmin/init.js
index f869407f..a45901d4 100644
--- a/avAdmin/init.js
+++ b/avAdmin/init.js
@@ -17,17 +17,5 @@
 
 angular.module('avAdmin', ['ui.bootstrap','ui.utils','ui.router']);
 
-angular.module('avAdmin').config(function($scope, ElectionsApi) {
-    /* Add New States Above */
-    var perms = {val: ""};
-    ElectionsApi
-        .getEditPerm(scope.id)
-        .then(
-        function (perm) {
-            perms.val = perm.split(":")[4].split("|");
-        }
-        );
-    angular.extend($scope, {
-        perms: perms
-    });
+angular.module('avAdmin').config(function() {
 });

From 703acb2188a2e12777eedd426135da59f3e9b5fd Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Wed, 6 Sep 2023 15:33:29 -0500
Subject: [PATCH 04/23] wip

---
 avAdmin/admin-controller/admin-controller.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/avAdmin/admin-controller/admin-controller.js b/avAdmin/admin-controller/admin-controller.js
index 0a3da48c..76507526 100644
--- a/avAdmin/admin-controller/admin-controller.js
+++ b/avAdmin/admin-controller/admin-controller.js
@@ -237,10 +237,6 @@ angular
           }
         );
 
-      angular.extend($scope, {
-        perms: $scope.
-      })
-
       if (states.indexOf($scope.state) >= 0) {
           $scope.sidebarlinks = [];
           if (!!id)

From 5315d9a24314b333177dbd5b783783dcd87d2178 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Wed, 6 Sep 2023 15:38:38 -0500
Subject: [PATCH 05/23] wip

---
 avAdmin/admin-directives/dashboard/dashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/avAdmin/admin-directives/dashboard/dashboard.js b/avAdmin/admin-directives/dashboard/dashboard.js
index e5362627..2010d1a0 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.js
+++ b/avAdmin/admin-directives/dashboard/dashboard.js
@@ -1355,7 +1355,7 @@ angular.module('avAdmin')
 
     return {
       restrict: 'AE',
-      scope: {},
+      scope: true,
       link: link,
       templateUrl: 'avAdmin/admin-directives/dashboard/dashboard.html'
     };

From cc9b7ea8be9ed339a73258b8613b17fd31b668f8 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Wed, 6 Sep 2023 15:51:05 -0500
Subject: [PATCH 06/23] wip

---
 avAdmin/admin-controller/admin-controller.js           |  1 -
 .../admin-sidebar-directive/admin-sidebar-directive.js | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/avAdmin/admin-controller/admin-controller.js b/avAdmin/admin-controller/admin-controller.js
index 76507526..2183cd6f 100644
--- a/avAdmin/admin-controller/admin-controller.js
+++ b/avAdmin/admin-controller/admin-controller.js
@@ -266,7 +266,6 @@ angular
 
                         if (
                           perm.indexOf('event-view-activity') !== -1 ||
-                          perm.indexOf('view') !== -1 || 
                           perm.indexOf('edit') !== -1
                         ) {
                           $scope.sidebarlinks = $scope.sidebarlinks.concat([
diff --git a/avAdmin/admin-sidebar-directive/admin-sidebar-directive.js b/avAdmin/admin-sidebar-directive/admin-sidebar-directive.js
index 5cd03c87..41dfdd96 100644
--- a/avAdmin/admin-sidebar-directive/admin-sidebar-directive.js
+++ b/avAdmin/admin-sidebar-directive/admin-sidebar-directive.js
@@ -46,16 +46,6 @@ angular.module('avAdmin')
           scope.isAdmin = $cookies.get("isAdmin" + postfix);
           scope.active = attrs.active;
           scope.isEditingDraft = DraftElection.isEditingDraft;
-          scope.globalPerms = { val: '' };
-
-          // update perms
-          ElectionsApi
-            .getEditPerm(null)
-            .then(
-              function (perm) {
-                scope.globalPerms.val = perm;
-              }
-            );
       }
 
       return {

From 739dde6bc5116613bc5924c421355107d9f9e28b Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Wed, 6 Sep 2023 16:04:24 -0500
Subject: [PATCH 07/23] wip

---
 avAdmin/admin-directives/elbasic/elbasic.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/avAdmin/admin-directives/elbasic/elbasic.js b/avAdmin/admin-directives/elbasic/elbasic.js
index b1a9e733..2c55a3b1 100644
--- a/avAdmin/admin-directives/elbasic/elbasic.js
+++ b/avAdmin/admin-directives/elbasic/elbasic.js
@@ -30,7 +30,10 @@ angular.module('avAdmin')
           scope.layouts = ['simple', /*'2questions-conditional', 'pcandidates-election'*/];
           scope.themes = ['default'/*, 'podemos'*/];
 
-          scope.allow_social_edit = ConfigService.share_social.allow_edit;
+          scope.allow_social_edit = ConfigService.share_social.allow_edit && (
+            scope.perms.val.indexOf("edit") !== -1 ||
+            scope.perms.val.indexOf("update-share") !== -1
+          );
 
           scope.electionEditable = function() {
             return !scope.election.id || scope.election.status === "registered";
@@ -74,8 +77,7 @@ angular.module('avAdmin')
 
       return {
         restrict: 'AE',
-        scope: {
-        },
+        scope: true,
         link: link,
         templateUrl: 'avAdmin/admin-directives/elbasic/elbasic.html'
       };

From 35fb846cd3c8e59656126ca65bc5eaebcdcc33e8 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 14:43:57 -0500
Subject: [PATCH 08/23] wip

---
 avAdmin/admin-controller/admin-controller.js    |  2 +-
 avAdmin/admin-directives/dashboard/dashboard.js | 10 ----------
 avAdmin/admin-directives/elcensus/elcensus.js   | 12 +-----------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/avAdmin/admin-controller/admin-controller.js b/avAdmin/admin-controller/admin-controller.js
index 2183cd6f..0bb345e4 100644
--- a/avAdmin/admin-controller/admin-controller.js
+++ b/avAdmin/admin-controller/admin-controller.js
@@ -275,7 +275,7 @@ angular
           
 
                         // update election perms
-                        $scope.perms.val = perm;
+                        $scope.perms.val = perm.split(":")[4].split("|");
                       }
                     );
                 }
diff --git a/avAdmin/admin-directives/dashboard/dashboard.js b/avAdmin/admin-directives/dashboard/dashboard.js
index 2010d1a0..95f73bf1 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.js
+++ b/avAdmin/admin-directives/dashboard/dashboard.js
@@ -668,16 +668,6 @@ angular.module('avAdmin')
           $state.go("admin.basic");
         }
 
-        /*
-        scope.perms = {val: ""};
-        ElectionsApi
-          .getEditPerm(scope.id)
-          .then(
-            function (perm) {
-              scope.perms.val = perm.split(":")[4].split("|");
-            }
-          );
-        */
         scope.publicURL = ConfigService.publicURL;
         scope.launchedTally = false;
         
diff --git a/avAdmin/admin-directives/elcensus/elcensus.js b/avAdmin/admin-directives/elcensus/elcensus.js
index db722636..03f346a7 100644
--- a/avAdmin/admin-directives/elcensus/elcensus.js
+++ b/avAdmin/admin-directives/elcensus/elcensus.js
@@ -49,15 +49,6 @@ angular.module('avAdmin')
       scope.nomore = false;
       scope.error = null;
       scope.page = 1;
-
-      scope.perms = {val: ""};
-      ElectionsApi
-        .getEditPerm(scope.election.id)
-        .then(
-          function (perm) {
-            scope.perms.val = perm;
-          }
-        );
         
       scope.msg = null;
       scope.filterStr = "";
@@ -1207,8 +1198,7 @@ angular.module('avAdmin')
 
     return {
       restrict: 'AE',
-      scope: {
-      },
+      scope: true,
       link: link,
       templateUrl: 'avAdmin/admin-directives/elcensus/elcensus.html'
     };

From 9a0349b76872eb59d3f4d7a95fbdbf50a82a175a Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 14:57:02 -0500
Subject: [PATCH 09/23] wip

---
 avAdmin/admin-directives/dashboard/dashboard.html | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/avAdmin/admin-directives/dashboard/dashboard.html b/avAdmin/admin-directives/dashboard/dashboard.html
index 3aa59005..dabe5e86 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.html
+++ b/avAdmin/admin-directives/dashboard/dashboard.html
@@ -23,7 +23,7 @@ <h2>
       <ul class="dropdown-menu">
         <li
           ng-repeat="action in actions"
-          ng-class="{'disabled': !action.enableFunc()}">
+          ng-if="action.enableFunc()">
           <a ng-click="action.enableFunc() && action.actionFunc()">
             <i class="{{action.iconClass}}"></i>
             <span ng-i18next>
@@ -71,9 +71,8 @@ <h2>
           </div>
           <button 
             ng-click="doActionConfirm($index)" 
-            class="actionbtn btn btn-success" 
-            ng-disabled="!commands[$index].enableFunc()"
-            ng-if="index == $index && nextaction" 
+            class="actionbtn btn btn-success"
+            ng-if="index == $index && nextaction && commands[$index].enableFunc()" 
             ng-class="['election-status-action-' + index]">
             <div 
               class="small {{ nextaction }}" 
@@ -87,8 +86,7 @@ <h2>
           <button
             ng-click="doActionConfirm($index)"
             class="actionbtn btn btn-success"
-            ng-disabled="!commands[$index].enableFunc()"
-            ng-if="getStatusIndex('results_ok') === $index && index === 1 + $index"
+            ng-if="getStatusIndex('results_ok') === $index && index === 1 + $index && commands[$index].enableFunc()"
           >
             <div 
               class="small" 

From db2e7035e91800b0095d7a846a21cd399597c05d Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 15:12:40 -0500
Subject: [PATCH 10/23] wip

---
 avAdmin/admin-directives/dashboard/dashboard.html | 7 +++----
 avAdmin/admin-directives/dashboard/dashboard.js   | 6 ++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/avAdmin/admin-directives/dashboard/dashboard.html b/avAdmin/admin-directives/dashboard/dashboard.html
index dabe5e86..48367082 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.html
+++ b/avAdmin/admin-directives/dashboard/dashboard.html
@@ -10,7 +10,7 @@ <h2>
          </h2>
        </span>
     </div>
-    <div class="dropdown pull-right actions-div">
+    <div class="dropdown pull-right actions-div"  ng-if="enabledActions().length > 0">
       <button
         class="btn btn-success actionbtn ng-scope btn-primary dropdown-toggle"
         type="button"
@@ -22,8 +22,7 @@ <h2>
       </button>
       <ul class="dropdown-menu">
         <li
-          ng-repeat="action in actions"
-          ng-if="action.enableFunc()">
+          ng-repeat="action in enabledActions()">
           <a ng-click="action.enableFunc() && action.actionFunc()">
             <i class="{{action.iconClass}}"></i>
             <span ng-i18next>
@@ -121,7 +120,7 @@ <h2>
                 <strong>{{ election.auth.census|number }}</strong><br/>
                 <button
                   ng-click="sendAuthCodes()"
-                  ng-disabled="perms.val.indexOf('send-auth-all') === -1 && perms.val.indexOf('edit') === -1"
+                  ng-if="perms.val.indexOf('send-auth-all') !== -1 || perms.val.indexOf('edit') !== -1"
                   class="btn btn-success send-auth pull-left">
                     <i class="fa fa-sw fa-send"></i>
                     <span ng-i18next>
diff --git a/avAdmin/admin-directives/dashboard/dashboard.js b/avAdmin/admin-directives/dashboard/dashboard.js
index 95f73bf1..948dbcf0 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.js
+++ b/avAdmin/admin-directives/dashboard/dashboard.js
@@ -1255,6 +1255,12 @@ angular.module('avAdmin')
           },
         ];
 
+        scope.enabledActions = function () {
+          return scope.actions.filter(function (action) {
+            return action.enableFunc();
+          });
+        };
+
         scope.statuses = scope.statuses;
         scope.election = {};
         scope.index = 0;

From 0b5028eadbac8d2d0e3de5f670dd5ae76ed59aa9 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 15:24:45 -0500
Subject: [PATCH 11/23] wip

---
 avAdmin/admin-controller/admin-controller.js      | 6 ++++++
 avAdmin/admin-directives/dashboard/dashboard.html | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/avAdmin/admin-controller/admin-controller.js b/avAdmin/admin-controller/admin-controller.js
index 0bb345e4..0caa444b 100644
--- a/avAdmin/admin-controller/admin-controller.js
+++ b/avAdmin/admin-controller/admin-controller.js
@@ -217,6 +217,12 @@ angular
       states = states.concat(plugins_data.states);
 
 
+      $scope.hasPerms = function (optionList) {
+        return optionList.some(function (option ) {
+          return $scope.perms.val.includes(option);
+        });
+      };
+
       // get election perms, with a default of no perms
       $scope.perms = {val: ""};
       ElectionsApi
diff --git a/avAdmin/admin-directives/dashboard/dashboard.html b/avAdmin/admin-directives/dashboard/dashboard.html
index 48367082..e96a1b87 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.html
+++ b/avAdmin/admin-directives/dashboard/dashboard.html
@@ -159,13 +159,14 @@ <h2>
             <button
               class="btn btn-block btn-lg btn-success-action" 
               ng-if="nextaction" 
-              ng-disabled="!commands[index].enableFunc()"
+              ng-if="commands[index].enableFunc()"
               ng-i18next="{{ nextaction }}"
               ng-click="doActionConfirm(index)">
             </button>
 
             <button
               ng-click="duplicateElection()"
+              ng-if="hasPerms(['create'])"
               class="btn btn-block btn-lg btn-success"
               ng-i18next>
               avAdmin.dashboard.duplicateElection

From 0698fffa10b7c77b9ee3e9c41f853df653242f81 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 15:49:45 -0500
Subject: [PATCH 12/23] wip

---
 .../admin-directives/dashboard/dashboard.html | 17 ++--
 .../admin-directives/dashboard/dashboard.js   | 91 +++++++++++++++++--
 2 files changed, 94 insertions(+), 14 deletions(-)

diff --git a/avAdmin/admin-directives/dashboard/dashboard.html b/avAdmin/admin-directives/dashboard/dashboard.html
index e96a1b87..af55e4f9 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.html
+++ b/avAdmin/admin-directives/dashboard/dashboard.html
@@ -10,7 +10,7 @@ <h2>
          </h2>
        </span>
     </div>
-    <div class="dropdown pull-right actions-div"  ng-if="enabledActions().length > 0">
+    <div class="dropdown pull-right actions-div"  ng-if="permittedActions().length > 0">
       <button
         class="btn btn-success actionbtn ng-scope btn-primary dropdown-toggle"
         type="button"
@@ -22,7 +22,8 @@ <h2>
       </button>
       <ul class="dropdown-menu">
         <li
-          ng-repeat="action in enabledActions()">
+          ng-repeat="action in permittedActions()"
+          ng-disabled="!commands[$index].enableFunc()">
           <a ng-click="action.enableFunc() && action.actionFunc()">
             <i class="{{action.iconClass}}"></i>
             <span ng-i18next>
@@ -71,7 +72,8 @@ <h2>
           <button 
             ng-click="doActionConfirm($index)" 
             class="actionbtn btn btn-success"
-            ng-if="index == $index && nextaction && commands[$index].enableFunc()" 
+            ng-disabled="!commands[$index].enableFunc()"
+            ng-if="index == $index && nextaction && commands[$index].permsFunc()" 
             ng-class="['election-status-action-' + index]">
             <div 
               class="small {{ nextaction }}" 
@@ -85,7 +87,8 @@ <h2>
           <button
             ng-click="doActionConfirm($index)"
             class="actionbtn btn btn-success"
-            ng-if="getStatusIndex('results_ok') === $index && index === 1 + $index && commands[$index].enableFunc()"
+            ng-disabled="!commands[$index].enableFunc()"
+            ng-if="getStatusIndex('results_ok') === $index && index === 1 + $index && commands[$index].permsFunc()"
           >
             <div 
               class="small" 
@@ -120,7 +123,7 @@ <h2>
                 <strong>{{ election.auth.census|number }}</strong><br/>
                 <button
                   ng-click="sendAuthCodes()"
-                  ng-if="perms.val.indexOf('send-auth-all') !== -1 || perms.val.indexOf('edit') !== -1"
+                  ng-if="scope.hasPerms(['send-auth-all', 'edit'])"
                   class="btn btn-success send-auth pull-left">
                     <i class="fa fa-sw fa-send"></i>
                     <span ng-i18next>
@@ -158,8 +161,8 @@ <h2>
 
             <button
               class="btn btn-block btn-lg btn-success-action" 
-              ng-if="nextaction" 
-              ng-if="commands[index].enableFunc()"
+              ng-if="nextaction && commands[index].permsFunc()" 
+              ng-disabled="!commands[index].enableFunc()"
               ng-i18next="{{ nextaction }}"
               ng-click="doActionConfirm(index)">
             </button>
diff --git a/avAdmin/admin-directives/dashboard/dashboard.js b/avAdmin/admin-directives/dashboard/dashboard.js
index 948dbcf0..5427adf8 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.js
+++ b/avAdmin/admin-directives/dashboard/dashboard.js
@@ -733,6 +733,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("register") !== -1 ||
                 scope.perms.val.indexOf("edit") !== -1
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["register", "edit"])
             }
           },
           {
@@ -745,6 +748,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("create") !== -1 ||
                 scope.perms.val.indexOf("edit") !== -1
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["create", "edit"])
             }
           },
           {
@@ -765,6 +771,9 @@ angular.module('avAdmin')
                   )
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["start", "edit"])
             }
           },
           {
@@ -777,6 +786,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("stop") !== -1 ||
                 scope.perms.val.indexOf("edit") !== -1
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["stop", "edit"])
             }
           },
           {
@@ -833,6 +845,9 @@ angular.module('avAdmin')
                   )
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["tally", "edit"])
             }
           },
           {
@@ -881,6 +896,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("calculate-results") !== -1 ||
                 scope.perms.val.indexOf("edit") !== -1
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["calculate-results", "edit"])
             }
           },
           {
@@ -920,6 +938,9 @@ angular.module('avAdmin')
                   scope.perms.val.indexOf("edit") !== -1 
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["publish-results", "edit"])
             }
           }
         ];
@@ -931,12 +952,11 @@ angular.module('avAdmin')
             actionFunc: function() { return scope.changeSocial(); },
             enableFunc: function() { 
               return (
-                ConfigService.share_social.allow_edit &&
-                (
-                  scope.perms.val.indexOf("update-share") !== -1 ||
-                  scope.perms.val.indexOf("edit") !== -1
-                )
+                ConfigService.share_social.allow_edit && scope.hasPerms(["update-share", "edit"])
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["update-share", "edit"])
             }
           },
           {
@@ -965,6 +985,9 @@ angular.module('avAdmin')
                   )
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["start", "edit"])
             }
           },
           {
@@ -984,6 +1007,9 @@ angular.module('avAdmin')
                   scope.perms.val.indexOf("edit") !== -1
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["suspend", "edit"])
             }
           },
           {
@@ -1002,6 +1028,9 @@ angular.module('avAdmin')
                   scope.perms.val.indexOf("edit") !== -1
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["resume", "edit"])
             }
           },
           {
@@ -1026,6 +1055,9 @@ angular.module('avAdmin')
                   scope.perms.val.indexOf("edit") !== -1
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["stop", "edit"])
             }
           },
           {
@@ -1049,6 +1081,9 @@ angular.module('avAdmin')
                   )
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["allow-tally", "edit"])
             }
           },
           {
@@ -1065,6 +1100,9 @@ angular.module('avAdmin')
                   scope.perms.val.indexOf("edit") !== -1
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["tally", "edit"])
             }
           },
           {
@@ -1086,6 +1124,9 @@ angular.module('avAdmin')
                   scope.perms.val.indexOf("edit") !== -1
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["calculate-results", "edit"])
             }
           },
           {
@@ -1107,6 +1148,9 @@ angular.module('avAdmin')
                   scope.perms.val.indexOf("edit") !== -1
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["publish-results", "edit"])
             }
           },
           {
@@ -1123,6 +1167,9 @@ angular.module('avAdmin')
                   scope.perms.val.indexOf("edit") !== -1
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["publish-results", "edit"])
             }
           },
           {
@@ -1134,6 +1181,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("send-auth-all") !== -1 ||
                 scope.perms.val.indexOf("edit") !== -1
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["send-auth-all", "edit"])
             }
           },
           {
@@ -1145,6 +1195,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("archive") !== -1 ||
                 scope.perms.val.indexOf("edit") !== -1
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["archive", "edit"])
             }
           },
           {
@@ -1156,6 +1209,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("unarchive") !== -1 ||
                 scope.perms.val.indexOf("edit") !== -1
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["unarchive", "edit"])
             }
           },
           {
@@ -1167,6 +1223,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("set-public-candidates") !== -1 ||
                 scope.perms.val.indexOf("edit") !== -1
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["set-public-candidates", "edit"])
             }
           },
           {
@@ -1178,6 +1237,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("set-public-candidates") !== -1 ||
                 scope.perms.val.indexOf("edit") !== -1
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["set-public-candidates", "edit"])
             }
           },
           {
@@ -1194,6 +1256,9 @@ angular.module('avAdmin')
                   scope.perms.val.indexOf("edit") !== -1
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["set-authenticate-otl-periods", "edit"])
             }
           },
           {
@@ -1210,6 +1275,9 @@ angular.module('avAdmin')
                   scope.perms.val.indexOf("edit") !== -1
                 )
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["set-authenticate-otl-periods", "edit"])
             }
           },
           {
@@ -1221,6 +1289,9 @@ angular.module('avAdmin')
                 ['registered', 'created'].indexOf(scope.election.status) !== -1 && 
                 scope.perms.val.indexOf("edit") !== -1
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["edit"])
             }
           },
           {
@@ -1236,6 +1307,9 @@ angular.module('avAdmin')
                 !!scope.election.trusteeKeysState &&
                 !!scope.election.trusteeKeysState.find(function (e) { return ['initial', 'downloaded'].includes(e.state); }) 
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["edit"])
             }
           },
           {
@@ -1251,13 +1325,16 @@ angular.module('avAdmin')
                 !!scope.election.trusteeKeysState &&
                 !!scope.election.trusteeKeysState.find(function (e) { return e.state === 'deleted'; }) 
               );
+            },
+            permsFunc: function() {
+              return scope.hasPerms(["edit"])
             }
           },
         ];
 
-        scope.enabledActions = function () {
+        scope.permittedActions = function () {
           return scope.actions.filter(function (action) {
-            return action.enableFunc();
+            return action.permsFunc();
           });
         };
 

From bfed8d51960692e99bb4b57b2214f5d0262e63f9 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 15:51:10 -0500
Subject: [PATCH 13/23] wip

---
 .../admin-directives/dashboard/dashboard.js   | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/avAdmin/admin-directives/dashboard/dashboard.js b/avAdmin/admin-directives/dashboard/dashboard.js
index 5427adf8..7e5b13ad 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.js
+++ b/avAdmin/admin-directives/dashboard/dashboard.js
@@ -735,7 +735,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["register", "edit"])
+              return scope.hasPerms(["register", "edit"]);
             }
           },
           {
@@ -750,7 +750,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["create", "edit"])
+              return scope.hasPerms(["create", "edit"]);
             }
           },
           {
@@ -773,7 +773,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["start", "edit"])
+              return scope.hasPerms(["start", "edit"]);
             }
           },
           {
@@ -788,7 +788,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["stop", "edit"])
+              return scope.hasPerms(["stop", "edit"]);
             }
           },
           {
@@ -847,7 +847,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["tally", "edit"])
+              return scope.hasPerms(["tally", "edit"]);
             }
           },
           {
@@ -898,7 +898,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["calculate-results", "edit"])
+              return scope.hasPerms(["calculate-results", "edit"]);
             }
           },
           {
@@ -940,7 +940,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["publish-results", "edit"])
+              return scope.hasPerms(["publish-results", "edit"]);
             }
           }
         ];
@@ -956,7 +956,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["update-share", "edit"])
+              return scope.hasPerms(["update-share", "edit"]);
             }
           },
           {
@@ -987,7 +987,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["start", "edit"])
+              return scope.hasPerms(["start", "edit"]);
             }
           },
           {
@@ -1009,7 +1009,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["suspend", "edit"])
+              return scope.hasPerms(["suspend", "edit"]);
             }
           },
           {
@@ -1030,7 +1030,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["resume", "edit"])
+              return scope.hasPerms(["resume", "edit"]);
             }
           },
           {
@@ -1057,7 +1057,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["stop", "edit"])
+              return scope.hasPerms(["stop", "edit"]);
             }
           },
           {
@@ -1083,7 +1083,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["allow-tally", "edit"])
+              return scope.hasPerms(["allow-tally", "edit"]);
             }
           },
           {
@@ -1102,7 +1102,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["tally", "edit"])
+              return scope.hasPerms(["tally", "edit"]);
             }
           },
           {
@@ -1126,7 +1126,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["calculate-results", "edit"])
+              return scope.hasPerms(["calculate-results", "edit"]);
             }
           },
           {
@@ -1150,7 +1150,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["publish-results", "edit"])
+              return scope.hasPerms(["publish-results", "edit"]);
             }
           },
           {
@@ -1169,7 +1169,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["publish-results", "edit"])
+              return scope.hasPerms(["publish-results", "edit"]);
             }
           },
           {
@@ -1183,7 +1183,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["send-auth-all", "edit"])
+              return scope.hasPerms(["send-auth-all", "edit"]);
             }
           },
           {
@@ -1197,7 +1197,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["archive", "edit"])
+              return scope.hasPerms(["archive", "edit"]);
             }
           },
           {
@@ -1211,7 +1211,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["unarchive", "edit"])
+              return scope.hasPerms(["unarchive", "edit"]);
             }
           },
           {
@@ -1225,7 +1225,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["set-public-candidates", "edit"])
+              return scope.hasPerms(["set-public-candidates", "edit"]);
             }
           },
           {
@@ -1239,7 +1239,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["set-public-candidates", "edit"])
+              return scope.hasPerms(["set-public-candidates", "edit"]);
             }
           },
           {
@@ -1258,7 +1258,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["set-authenticate-otl-periods", "edit"])
+              return scope.hasPerms(["set-authenticate-otl-periods", "edit"]);
             }
           },
           {
@@ -1277,7 +1277,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["set-authenticate-otl-periods", "edit"])
+              return scope.hasPerms(["set-authenticate-otl-periods", "edit"]);
             }
           },
           {
@@ -1291,7 +1291,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["edit"])
+              return scope.hasPerms(["edit"]);
             }
           },
           {
@@ -1309,7 +1309,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["edit"])
+              return scope.hasPerms(["edit"]);
             }
           },
           {
@@ -1327,7 +1327,7 @@ angular.module('avAdmin')
               );
             },
             permsFunc: function() {
-              return scope.hasPerms(["edit"])
+              return scope.hasPerms(["edit"]);
             }
           },
         ];

From ae5e961eacb7601ef5a7ef26213451ba86b56c65 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 16:18:22 -0500
Subject: [PATCH 14/23] wip

---
 avAdmin/admin-directives/dashboard/dashboard.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/avAdmin/admin-directives/dashboard/dashboard.html b/avAdmin/admin-directives/dashboard/dashboard.html
index af55e4f9..d0f5c364 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.html
+++ b/avAdmin/admin-directives/dashboard/dashboard.html
@@ -23,7 +23,7 @@ <h2>
       <ul class="dropdown-menu">
         <li
           ng-repeat="action in permittedActions()"
-          ng-disabled="!commands[$index].enableFunc()">
+          ng-disabled="!action.enableFunc()">
           <a ng-click="action.enableFunc() && action.actionFunc()">
             <i class="{{action.iconClass}}"></i>
             <span ng-i18next>

From 91c859cd36ec06cf385fe3710bb426fc79f39944 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 16:29:21 -0500
Subject: [PATCH 15/23] wip

---
 avAdmin/admin-directives/dashboard/dashboard.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/avAdmin/admin-directives/dashboard/dashboard.html b/avAdmin/admin-directives/dashboard/dashboard.html
index d0f5c364..58daf703 100644
--- a/avAdmin/admin-directives/dashboard/dashboard.html
+++ b/avAdmin/admin-directives/dashboard/dashboard.html
@@ -23,7 +23,7 @@ <h2>
       <ul class="dropdown-menu">
         <li
           ng-repeat="action in permittedActions()"
-          ng-disabled="!action.enableFunc()">
+          ng-class="{'disabled': !action.enableFunc()}">
           <a ng-click="action.enableFunc() && action.actionFunc()">
             <i class="{{action.iconClass}}"></i>
             <span ng-i18next>

From 47cbb37e0fa909e93ae64412705891aeed515986 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 17:09:45 -0500
Subject: [PATCH 16/23] wip

---
 .../ballot-box/ballot-box.html                |  1 +
 .../admin-directives/ballot-box/ballot-box.js | 12 +++++
 .../admin-directives/elcensus/elcensus.html   |  2 +
 avAdmin/admin-directives/elcensus/elcensus.js | 52 ++++++++++++++++++-
 4 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/avAdmin/admin-directives/ballot-box/ballot-box.html b/avAdmin/admin-directives/ballot-box/ballot-box.html
index 427ac4ac..edf7d207 100644
--- a/avAdmin/admin-directives/ballot-box/ballot-box.html
+++ b/avAdmin/admin-directives/ballot-box/ballot-box.html
@@ -125,6 +125,7 @@ <h2 ng-i18next>avAdmin.ballotBox.title</h2>
           <td class="small-col text-right actions">
             <span
                 ng-repeat="command in row_commands"
+                ng-if="command.permsFunc()"
                 ng-class="{'disabled': !command.enableFunc(obj)}">
                 <a ng-click="command.actionFunc(obj)">
                     <i class="{{command.iconClass}}"
diff --git a/avAdmin/admin-directives/ballot-box/ballot-box.js b/avAdmin/admin-directives/ballot-box/ballot-box.js
index 1950304c..ef38f177 100644
--- a/avAdmin/admin-directives/ballot-box/ballot-box.js
+++ b/avAdmin/admin-directives/ballot-box/ballot-box.js
@@ -228,6 +228,9 @@ angular.module('avAdmin')
               ballotBox.num_tally_sheets > 0 &&
               ElectionsApi.getCachedEditPerm(scope.electionId).indexOf('list-tally-sheets') !== -1
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["list-tally-sheets", "edit"]);
           }
         },
         {
@@ -313,6 +316,9 @@ angular.module('avAdmin')
                 )
               )
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["override-tally-sheets", "add-tally-sheets"]);
           }
         },
         {
@@ -351,6 +357,9 @@ angular.module('avAdmin')
               ballotBox.num_tally_sheets > 0 &&
               ElectionsApi.getCachedEditPerm(scope.electionId).indexOf('delete-tally-sheets') !== -1
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["delete-tally-sheets"]);
           }
         },
         {
@@ -377,6 +386,9 @@ angular.module('avAdmin')
             return (
               ElectionsApi.getCachedEditPerm(scope.electionId).indexOf('delete-ballot-boxes') !== -1
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["delete-ballot-boxes"]);
           }
         }
       ];
diff --git a/avAdmin/admin-directives/elcensus/elcensus.html b/avAdmin/admin-directives/elcensus/elcensus.html
index c8a91019..59e8e764 100644
--- a/avAdmin/admin-directives/elcensus/elcensus.html
+++ b/avAdmin/admin-directives/elcensus/elcensus.html
@@ -30,6 +30,7 @@ <h2 ng-i18next>avAdmin.sidebar.census</h2>
         <ul class="dropdown-menu" role="menu">
           <li
             ng-repeat="command in commands"
+            ng-if="command.permsFunc()"
             ng-class="{'disabled': !command.enableFunc()}">
             <a ng-click="command.actionFunc()">
               <i class="{{command.iconClass}}"></i>
@@ -197,6 +198,7 @@ <h2 ng-i18next>avAdmin.sidebar.census</h2>
               <ul class="dropdown-menu" role="menu">
                 <li
                   ng-repeat="command in row_commands"
+                  ng-if="command.permsFunc()"
                   ng-class="{'disabled': !command.enableFunc([c])}"
                 >
                   <a ng-click="command.actionFunc(c)">
diff --git a/avAdmin/admin-directives/elcensus/elcensus.js b/avAdmin/admin-directives/elcensus/elcensus.js
index 03f346a7..6ba4013e 100644
--- a/avAdmin/admin-directives/elcensus/elcensus.js
+++ b/avAdmin/admin-directives/elcensus/elcensus.js
@@ -444,6 +444,9 @@ angular.module('avAdmin')
               scope.perms.val.indexOf("edit") !== -1 ||
               scope.election.id === undefined
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["census-add", "edit"]);
           }
         },
         {
@@ -456,6 +459,9 @@ angular.module('avAdmin')
               scope.perms.val.indexOf("edit") !== -1 ||
               scope.election.id === undefined
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["census-add", "edit"]);
           }
         },
         {
@@ -472,19 +478,28 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("edit") !== -1
               )
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["view-census", "edit"]);
           }
         },
         {
           i18nString: 'selectAllShownAction',
           iconClass: 'fa fa-check-square-o',
           actionFunc: function() { return scope.selectQueried(true); },
-          enableFunc: function() { return scope.shown().length > 0; }
+          enableFunc: function() { return scope.shown().length > 0; },
+          permsFunc: function() {
+            return true;
+          }
         },
         {
           i18nString: 'deselectAllShownAction',
           iconClass: 'fa fa-square-o',
           actionFunc: function() { return selectQueried(false); },
-          enableFunc: function() { return scope.numSelected(scope.shown()) > 0; }
+          enableFunc: function() { return scope.numSelected(scope.shown()) > 0; },
+          permsFunc: function() {
+            return true;
+          }
         },
         {
           i18nString: 'activateAction',
@@ -513,6 +528,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("edit") !== -1
               )
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["census-activation", "edit"]);
           }
         },
         {
@@ -542,6 +560,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("edit") !== -1
               )
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["census-activation", "edit"]);
           }
         },
         {
@@ -578,6 +599,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("edit") !== -1
               )
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["census-delete", "census-delete-voted", "edit"]);
           }
         },
         {
@@ -592,6 +616,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("edit") !== -1
               )
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["send-auth", "edit"]);
           }
         }
       ];
@@ -657,6 +684,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("edit") !== -1
               )
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["event-view-activity", "edit"]);
           }
         },
         {
@@ -685,6 +715,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("edit") !== -1
               )
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["census-activation", "edit"]);
           }
         },
         {
@@ -713,6 +746,9 @@ angular.module('avAdmin')
                 scope.perms.val.indexOf("edit") !== -1
               )
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["census-activation", "edit"]);
           }
         },
         {
@@ -744,6 +780,9 @@ angular.module('avAdmin')
               ) ||
               scope.perms.val.indexOf("edit") !== -1
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["census-delete", "edit"]);
           }
         },
         {
@@ -758,6 +797,9 @@ angular.module('avAdmin')
               scope.perms.val.indexOf("send-auth") !== -1 ||
               scope.perms.val.indexOf("edit") !== -1
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["send-auth", "edit"]);
           }
         },
         {
@@ -771,6 +813,9 @@ angular.module('avAdmin')
               scope.perms.val.indexOf("generate-auth-code") !== -1 ||
               scope.perms.val.indexOf("edit") !== -1
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["generate-auth-code", "edit"]);
           }
         },
         {
@@ -787,6 +832,9 @@ angular.module('avAdmin')
               ) &&
               voters[0].voted_children_elections.length === 0
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["reset-voter", "edit"]);
           }
         }
       ];

From 2f3fe63afa38e47d00a0c005d859540a3a2b2a61 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 17:12:46 -0500
Subject: [PATCH 17/23] wip

---
 avAdmin/admin-directives/elections/elections.html | 1 +
 avAdmin/admin-directives/elections/elections.js   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/avAdmin/admin-directives/elections/elections.html b/avAdmin/admin-directives/elections/elections.html
index 98498089..573b04e2 100644
--- a/avAdmin/admin-directives/elections/elections.html
+++ b/avAdmin/admin-directives/elections/elections.html
@@ -40,6 +40,7 @@ <h2 ng-i18next>
               
               <button
                 class="btn btn-default new-election"
+                ng-if="scope.hasPerms(['create'])"
                 ui-sref="admin.new()">
                 <i class="fa fa-plus"></i>
               </button>
diff --git a/avAdmin/admin-directives/elections/elections.js b/avAdmin/admin-directives/elections/elections.js
index 4eaa31e0..6a18aaa2 100644
--- a/avAdmin/admin-directives/elections/elections.js
+++ b/avAdmin/admin-directives/elections/elections.js
@@ -199,9 +199,9 @@ angular.module('avAdmin')
         }
 
         return {
-        restrict: 'AE',
-        link: link,
-        templateUrl: 'avAdmin/admin-directives/elections/elections.html'
+            restrict: 'AE',
+            link: link,
+            templateUrl: 'avAdmin/admin-directives/elections/elections.html'
         };
     }
   );

From fef83f34c866392244b31582daf901899cfa5ab8 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 17:25:53 -0500
Subject: [PATCH 18/23] wip

---
 avAdmin/admin-directives/elections/elections.js   | 1 +
 avAdmin/admin-directives/elections/elections.less | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/avAdmin/admin-directives/elections/elections.js b/avAdmin/admin-directives/elections/elections.js
index 6a18aaa2..4983bd67 100644
--- a/avAdmin/admin-directives/elections/elections.js
+++ b/avAdmin/admin-directives/elections/elections.js
@@ -200,6 +200,7 @@ angular.module('avAdmin')
 
         return {
             restrict: 'AE',
+            scope: true,
             link: link,
             templateUrl: 'avAdmin/admin-directives/elections/elections.html'
         };
diff --git a/avAdmin/admin-directives/elections/elections.less b/avAdmin/admin-directives/elections/elections.less
index 6c2ae966..09bbfec5 100644
--- a/avAdmin/admin-directives/elections/elections.less
+++ b/avAdmin/admin-directives/elections/elections.less
@@ -113,11 +113,11 @@
 
     .reload-list {
       margin-left: 5px;
+      margin-right: 5px;
       float: left;
     }
 
     .new-election {
-      margin-left: 5px;
       margin-right: 20px;
       float: left;
     }

From 25660bf8801632899e727fc7999af3653695fb91 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 17:32:13 -0500
Subject: [PATCH 19/23] wip

---
 avAdmin/admin-directives/elections/elections.html | 2 +-
 avAdmin/admin-directives/elections/elections.js   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/avAdmin/admin-directives/elections/elections.html b/avAdmin/admin-directives/elections/elections.html
index 573b04e2..21211317 100644
--- a/avAdmin/admin-directives/elections/elections.html
+++ b/avAdmin/admin-directives/elections/elections.html
@@ -40,7 +40,7 @@ <h2 ng-i18next>
               
               <button
                 class="btn btn-default new-election"
-                ng-if="scope.hasPerms(['create'])"
+                ng-if="hasPerms(['create'])"
                 ui-sref="admin.new()">
                 <i class="fa fa-plus"></i>
               </button>
diff --git a/avAdmin/admin-directives/elections/elections.js b/avAdmin/admin-directives/elections/elections.js
index 4983bd67..6a18aaa2 100644
--- a/avAdmin/admin-directives/elections/elections.js
+++ b/avAdmin/admin-directives/elections/elections.js
@@ -200,7 +200,6 @@ angular.module('avAdmin')
 
         return {
             restrict: 'AE',
-            scope: true,
             link: link,
             templateUrl: 'avAdmin/admin-directives/elections/elections.html'
         };

From 53d77e6a977cf79bd54ce6f304f2dbe5a26b45bf Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 17:36:37 -0500
Subject: [PATCH 20/23] wip

---
 avAdmin/admin-sidebar-directive/admin-sidebar-directive.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/avAdmin/admin-sidebar-directive/admin-sidebar-directive.html b/avAdmin/admin-sidebar-directive/admin-sidebar-directive.html
index dfaaaed3..11eb50f9 100644
--- a/avAdmin/admin-sidebar-directive/admin-sidebar-directive.html
+++ b/avAdmin/admin-sidebar-directive/admin-sidebar-directive.html
@@ -17,7 +17,7 @@
     </a> 
   </li>
   
-  <li role="presentation" class="sub1">
+  <li role="presentation" class="sub1" ng-if="hasPerms(['create'])">
     <a
       ui-sref="admin.new()">
       <i class="fa-fw fa fa-plus-circle">

From d6082046b8483801b1e6e35b9fc735a664109fee Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 18:12:01 -0500
Subject: [PATCH 21/23] wip

---
 avAdmin/admin-directives/elbasic/elbasic.html | 2 +-
 avAdmin/admin-directives/elbasic/elbasic.js   | 5 +----
 avAdmin/admin-directives/elcensus/elcensus.js | 3 +++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/avAdmin/admin-directives/elbasic/elbasic.html b/avAdmin/admin-directives/elbasic/elbasic.html
index 71beedb2..f1ed1eeb 100644
--- a/avAdmin/admin-directives/elbasic/elbasic.html
+++ b/avAdmin/admin-directives/elbasic/elbasic.html
@@ -8,7 +8,7 @@ <h2 ng-i18next>avAdmin.sidebar.basic</h2>
           class="btn btn-success btn-social ng-scope btn-primary"
           type="button"
           ng-i18next="avAdmin.dashboard.actions.changeSocial"
-          ng-disabled="!allow_social_edit"
+          ng-if="allow_social_edit"
           ng-click="openSocialModal()"
         >
         </button>
diff --git a/avAdmin/admin-directives/elbasic/elbasic.js b/avAdmin/admin-directives/elbasic/elbasic.js
index 2c55a3b1..c1939323 100644
--- a/avAdmin/admin-directives/elbasic/elbasic.js
+++ b/avAdmin/admin-directives/elbasic/elbasic.js
@@ -30,10 +30,7 @@ angular.module('avAdmin')
           scope.layouts = ['simple', /*'2questions-conditional', 'pcandidates-election'*/];
           scope.themes = ['default'/*, 'podemos'*/];
 
-          scope.allow_social_edit = ConfigService.share_social.allow_edit && (
-            scope.perms.val.indexOf("edit") !== -1 ||
-            scope.perms.val.indexOf("update-share") !== -1
-          );
+          scope.allow_social_edit = ConfigService.share_social.allow_edit && scope.hasPerms(["update-share", "edit"]);
 
           scope.electionEditable = function() {
             return !scope.election.id || scope.election.status === "registered";
diff --git a/avAdmin/admin-directives/elcensus/elcensus.js b/avAdmin/admin-directives/elcensus/elcensus.js
index 6ba4013e..532e74a6 100644
--- a/avAdmin/admin-directives/elcensus/elcensus.js
+++ b/avAdmin/admin-directives/elcensus/elcensus.js
@@ -1105,6 +1105,9 @@ angular.module('avAdmin')
         scope.loading = true;
 
         ElectionsApi.waitForCurrent(function () {
+          if (!scope.hasPerms(["view-census", "edit"])) {
+            return;
+          }
           ElectionsApi.getCensus(
               scope.election,
               scope.page,

From c7a7f431f625ffde497d539f1facdc3d559add8c Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 18:19:07 -0500
Subject: [PATCH 22/23] wip

---
 avAdmin/admin-controller/admin-controller.js              | 8 +++++++-
 .../admin-sidebar-directive/admin-sidebar-directive.html  | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/avAdmin/admin-controller/admin-controller.js b/avAdmin/admin-controller/admin-controller.js
index 0caa444b..2ca12b90 100644
--- a/avAdmin/admin-controller/admin-controller.js
+++ b/avAdmin/admin-controller/admin-controller.js
@@ -292,7 +292,13 @@ angular
               {name: 'questions', icon: 'question-circle'},
               {name: 'auth', icon: 'unlock'},
               {name: 'censusConfig', icon: 'newspaper-o'},
-              {name: 'census', icon: 'users'},
+              {
+                name: 'census',
+                icon: 'users',
+                permsFunc: function() {
+                  return scope.hasPerms(["view-census", "edit"]);
+                }
+              },
               //{name: 'successAction', icon: 'star-o'},
               {name: 'adminFields', icon: 'user'},
               //{name: 'tally', icon: 'pie-chart'},
diff --git a/avAdmin/admin-sidebar-directive/admin-sidebar-directive.html b/avAdmin/admin-sidebar-directive/admin-sidebar-directive.html
index 11eb50f9..0b3b67b3 100644
--- a/avAdmin/admin-sidebar-directive/admin-sidebar-directive.html
+++ b/avAdmin/admin-sidebar-directive/admin-sidebar-directive.html
@@ -69,8 +69,8 @@
 
     <div 
       class="nav nav-pills nav-stacked" 
-      ng-repeat="l in sidebarlinks" 
-      ng-if="'adminFields' !== l.name || !!hasAdminFields"
+      ng-repeat="l in sidebarlinks"
+      ng-if="('adminFields' !== l.name || !!hasAdminFields) && (!l.permsFunc || l.permsFunc())"
     >
       <li 
         role="presentation" 

From 0496eb79accbe199ff58e8a44a2adb13d3a884f6 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Fri, 8 Sep 2023 18:24:35 -0500
Subject: [PATCH 23/23] wip

---
 avAdmin/admin-controller/admin-controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/avAdmin/admin-controller/admin-controller.js b/avAdmin/admin-controller/admin-controller.js
index 2ca12b90..e82bdbe8 100644
--- a/avAdmin/admin-controller/admin-controller.js
+++ b/avAdmin/admin-controller/admin-controller.js
@@ -296,7 +296,7 @@ angular
                 name: 'census',
                 icon: 'users',
                 permsFunc: function() {
-                  return scope.hasPerms(["view-census", "edit"]);
+                  return $scope.hasPerms(["view-census", "edit"]);
                 }
               },
               //{name: 'successAction', icon: 'star-o'},