From 9331006db3bc9b6148563c223483a651b397dce5 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <rpm@fthiessen.de>
Date: Sat, 13 Nov 2021 14:52:50 +0100
Subject: [PATCH] [permissions] Fixed permission parsing

---
 src/components/overview/AgendaView.vue |  2 +-
 src/pages/Management.vue               | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/components/overview/AgendaView.vue b/src/components/overview/AgendaView.vue
index f72e627..2834fb5 100644
--- a/src/components/overview/AgendaView.vue
+++ b/src/components/overview/AgendaView.vue
@@ -108,7 +108,7 @@ export default defineComponent({
     const calendarRealView = computed(() => (calendarDays.value != 7 ? 'day' : 'week'));
     const calendarDays = computed(() =>
       // <= 1023 is the breakpoint for sm to md
-      calendarView.value == 'day' ? 1 : windowWidth.value <= 1023 ? 3 : 7
+      calendarView.value == 'day' ? 1 : (windowWidth.value <= 1023 ? 3 : 7)
     );
     const events = ref<Agendas>({});
     const editor = ref<FG.Event | undefined>(undefined);
diff --git a/src/pages/Management.vue b/src/pages/Management.vue
index 10fb7f6..8d498ad 100644
--- a/src/pages/Management.vue
+++ b/src/pages/Management.vue
@@ -38,7 +38,7 @@
           <EventTypes />
         </q-tab-panel>
         <q-tab-panel name="jobtypes">
-          <JobTypes v-if="canEditJobTypes" />
+          <JobTypes />
         </q-tab-panel>
       </q-tab-panels>
     </q-page>
@@ -58,18 +58,11 @@ export default defineComponent({
   name: 'EventManagement',
   components: { EditEvent, EventTypes, JobTypes },
   setup() {
-    const canEditJobTypes = computed(() => hasPermission(PERMISSIONS.JOB_TYPE));
-
-    interface Tab {
-      name: string;
-      label: string;
-    }
-
-    const tabs: Tab[] = [
+    const tabs = computed(() => [
       { name: 'create', label: 'Veranstaltungen' },
-      { name: 'eventtypes', label: 'Veranstaltungsarten' },
-      { name: 'jobtypes', label: 'Dienstarten' },
-    ];
+      ...(hasPermission(PERMISSIONS.JOB_TYPE) ? [{ name: 'jobtypes', label: 'Dienstarten' }] : []),
+      ...(hasPermission(PERMISSIONS.EVENT_TYPE) ? [{ name: 'eventtypes', label: 'Veranstaltungsarten' }] : [])
+    ]);
 
     const drawer = ref<boolean>(false);
 
@@ -85,7 +78,6 @@ export default defineComponent({
     const tab = ref<string>('create');
 
     return {
-      canEditJobTypes,
       showDrawer,
       tab,
       tabs,