From 9cb5ec7dcff3ade3230785a10e8f08f116295976 Mon Sep 17 00:00:00 2001 From: dartcafe Date: Tue, 28 Jan 2020 23:09:26 +0100 Subject: Allow/Deny admin access --- lib/Db/Poll.php | 2 +- src/js/components/Navigation/PollNavigationItems.vue | 8 ++++---- src/js/components/PollList/PollListItem.vue | 8 ++++---- src/js/components/SideBar/SideBarTabConfiguration.vue | 18 +++++++++++++++--- src/js/components/SideBar/SideBarTabOptions.vue | 4 ++++ src/js/components/SideBar/SideBarTabShare.vue | 11 ++++++++++- 6 files changed, 38 insertions(+), 13 deletions(-) diff --git a/lib/Db/Poll.php b/lib/Db/Poll.php index 92a6e66f..ef8ffc28 100644 --- a/lib/Db/Poll.php +++ b/lib/Db/Poll.php @@ -131,7 +131,7 @@ class Poll extends Entity implements JsonSerializable { 'settings' => $this->settings, 'voteLimit' => intval($this->voteLimit), 'showResults' => $this->showResults, - 'adminAccess' => $this->adminAccess + 'adminAccess' => intVal($this->adminAccess) ]; } } diff --git a/src/js/components/Navigation/PollNavigationItems.vue b/src/js/components/Navigation/PollNavigationItems.vue index dd4ca532..8fe69b45 100644 --- a/src/js/components/Navigation/PollNavigationItems.vue +++ b/src/js/components/Navigation/PollNavigationItems.vue @@ -27,12 +27,12 @@ {{ t('polls', 'Clone poll') }} - - {{ t('polls', 'Delete poll') }} + + {{ (poll.isAdmin) ? t('polls', 'Delete poll as admin') : t('polls', 'Delete poll') }} - - {{ t('polls', 'Restore poll') }} + + {{ (poll.isAdmin) ? t('polls', 'Restore poll as admin') : t('polls', 'Restore poll') }} diff --git a/src/js/components/PollList/PollListItem.vue b/src/js/components/PollList/PollListItem.vue index 9f8a2cdd..8b10a77f 100644 --- a/src/js/components/PollList/PollListItem.vue +++ b/src/js/components/PollList/PollListItem.vue @@ -67,12 +67,12 @@ {{ t('polls', 'Clone poll') }} - - {{ t('polls', 'Delete poll') }} + + {{ (poll.isAdmin) ? t('polls', 'Delete poll as admin') : t('polls', 'Delete poll') }} - - {{ t('polls', 'Restore poll') }} + + {{ (poll.isAdmin) ? t('polls', 'Restore poll as admin') : t('polls', 'Restore poll') }} diff --git a/src/js/components/SideBar/SideBarTabConfiguration.vue b/src/js/components/SideBar/SideBarTabConfiguration.vue index 7a8fd207..8cd7fd5f 100644 --- a/src/js/components/SideBar/SideBarTabConfiguration.vue +++ b/src/js/components/SideBar/SideBarTabConfiguration.vue @@ -22,9 +22,8 @@