diff --git a/api/boardRoutes.php b/api/boardRoutes.php index ae4704c..1d2e2d4 100644 --- a/api/boardRoutes.php +++ b/api/boardRoutes.php @@ -93,7 +93,7 @@ $app->post('/autoactions', function() use($app, $jsonResponse) { }); $app->get('/autoactions', function() use($app, $jsonResponse) { - if (validateToken(true)) { + if (validateToken()) { $actions = R::findAll('autoaction'); $jsonResponse->addBeans($actions); } diff --git a/js/controllers/settings.js b/js/controllers/settings.js index f891df2..5c1a38c 100644 --- a/js/controllers/settings.js +++ b/js/controllers/settings.js @@ -63,6 +63,9 @@ function ($scope, UserService, AlertService) { $scope.actions = []; $scope.actionsLoading = true; $scope.updateActions = function() { + if ('1' !== $scope.currentUser.isAdmin) { + return; + } UserService.actions() .success(function(data) { $scope.actions = data.data; diff --git a/js/controllers/settingsAutoActions.js b/js/controllers/settingsAutoActions.js index ff7d238..33b3cd3 100644 --- a/js/controllers/settingsAutoActions.js +++ b/js/controllers/settingsAutoActions.js @@ -121,7 +121,7 @@ function ($scope, $interval, BoardService) { return text; }; - $scope.updateActions = function(actions) { + $scope.updateAutoActions = function(actions) { if (!actions) { return; } @@ -142,7 +142,7 @@ function ($scope, $interval, BoardService) { $scope.loadActions = function() { BoardService.getAutoActions() .success(function(data) { - $scope.updateActions(data.data); + $scope.updateAutoActions(data.data); $scope.loadingActions = false; }); }; @@ -168,7 +168,7 @@ function ($scope, $interval, BoardService) { $scope.actionData.isSaving = false; $scope.alerts.showAlerts(data.alerts); if (data.alerts[0].type == 'success') { - $scope.updateActions(data.data); + $scope.updateAutoActions(data.data); } }); }; @@ -179,7 +179,7 @@ function ($scope, $interval, BoardService) { BoardService.removeAutoAction(actionId) .success(function(data) { $scope.alerts.showAlerts(data.alerts); - $scope.updateActions(data.data); + $scope.updateAutoActions(data.data); }); }; diff --git a/partials/settingsAutoActions.html b/partials/settingsAutoActions.html index 4fec2a2..35ab81a 100644 --- a/partials/settingsAutoActions.html +++ b/partials/settingsAutoActions.html @@ -14,13 +14,13 @@ - + There are no automatic actions. Contact an admin user to create one. - + There are no current automatic actions. Use the Add Action form below to add one. - + There are no current boards. Use the Add Board button above to add one. @@ -38,7 +38,7 @@ -
+

Add Action