From 8a317c269e9e4aadd6cd07157e3c6261cdadb6d9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 1 Aug 2024 15:24:19 +0200
Subject: [PATCH] Fix news related permission issues

---
 website/client/src/components/header/menu.vue      | 2 +-
 website/client/src/components/news/newsContent.vue | 2 +-
 website/client/src/router/index.js                 | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/website/client/src/components/header/menu.vue b/website/client/src/components/header/menu.vue
index 6c5553681f..3736b60ebc 100644
--- a/website/client/src/components/header/menu.vue
+++ b/website/client/src/components/header/menu.vue
@@ -297,7 +297,7 @@
             <div class="topbar-dropdown">
               <router-link
                 v-if="user.permissions.fullAccess ||
-                  user.permissions.userSupport || user.permissions.newsPoster"
+                  user.permissions.userSupport"
                 class="topbar-dropdown-item dropdown-item"
                 :to="{name: 'adminPanel'}"
               >
diff --git a/website/client/src/components/news/newsContent.vue b/website/client/src/components/news/newsContent.vue
index ab80116430..1c3ecb507e 100644
--- a/website/client/src/components/news/newsContent.vue
+++ b/website/client/src/components/news/newsContent.vue
@@ -107,7 +107,7 @@ export default {
       if (lastPublishedPost) this.posts.push(lastPublishedPost);
 
       // If the user is authorized, show any draft
-      if (this.user && this.user.contributor.newsPoster) {
+      if (this.user && (this.user.permissions.news || this.user.permissions.fullAccess)) {
         this.posts.unshift(
           ...postsFromServer
             .filter(p => !p.published || moment().isBefore(p.publishDate)),
diff --git a/website/client/src/router/index.js b/website/client/src/router/index.js
index 5e51cff9fc..611cd201c6 100644
--- a/website/client/src/router/index.js
+++ b/website/client/src/router/index.js
@@ -189,7 +189,6 @@ const router = new VueRouter({
       meta: {
         privilegeNeeded: [ // any one of these is enough to give access
           'userSupport',
-          'newsPoster',
         ],
       },
       children: [