From a629d7f0480adb98f7857a3a874620707aea860c Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Sun, 7 Jan 2024 21:36:32 -0500
Subject: [PATCH] Fix override perms orgs (#1536)

* Fix override perms orgs

* remove useless card?
---
 pages/[type]/[id]/gallery.vue          |  3 --
 pages/[type]/[id]/settings/members.vue | 44 ++++++++++++++------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/pages/[type]/[id]/gallery.vue b/pages/[type]/[id]/gallery.vue
index 6b2955aba..f22e3a751 100644
--- a/pages/[type]/[id]/gallery.vue
+++ b/pages/[type]/[id]/gallery.vue
@@ -214,9 +214,6 @@
         @change="handleFiles"
       />
     </div>
-    <div v-else class="card header-buttons">
-      <span class="indicator"> <InfoIcon /> You don't have permission to upload images </span>
-    </div>
     <div class="items">
       <div v-for="(item, index) in project.gallery" :key="index" class="card gallery-item">
         <a class="gallery-thumbnail" @click="expandImage(item, index)">
diff --git a/pages/[type]/[id]/settings/members.vue b/pages/[type]/[id]/settings/members.vue
index 8a34d67c3..7112ca8b3 100644
--- a/pages/[type]/[id]/settings/members.vue
+++ b/pages/[type]/[id]/settings/members.vue
@@ -584,6 +584,27 @@ const acceptedOrgMembers = computed(() => {
   return props.organization?.members?.filter((x) => x.accepted) || []
 })
 
+function initMembers() {
+  const orgMembers = props.organization?.members || []
+
+  const selectedMembersForOrg = orgMembers.map((partialOrgMember) => {
+    const foundMember = props.allMembers.find((tM) => tM.user.id === partialOrgMember.user.id)
+    const returnVal = foundMember ?? partialOrgMember
+
+    // If replacing a partial with a full member, we need to mark as such.
+    returnVal.override = !!foundMember
+    returnVal.oldOverride = !!foundMember
+
+    return returnVal
+  })
+
+  allOrgMembers.value = selectedMembersForOrg
+
+  allTeamMembers.value = props.allMembers
+    .map((x) => ({ ...x, oldRole: x.role }))
+    .filter((x) => !selectedMembersForOrg.some((y) => y.user.id === x.user.id))
+}
+
 watch(
   [
     () => props.allMembers,
@@ -591,28 +612,9 @@ watch(
     () => props.project,
     () => props.currentMember,
   ],
-  () => {
-    const orgMembers = props.organization?.members || []
-
-    const selectedMembersForOrg = orgMembers.map((partialOrgMember) => {
-      const foundMember = props.allMembers.find((tM) => tM.user.id === partialOrgMember.user.id)
-      const returnVal = foundMember ?? partialOrgMember
-
-      // If replacing a partial with a full member, we need to mark as such.
-      returnVal.override = !!foundMember
-      returnVal.oldOverride = !!foundMember
-
-      return returnVal
-    })
-
-    allOrgMembers.value = selectedMembersForOrg
-
-    allTeamMembers.value = props.allMembers
-      .map((x) => ({ ...x, oldRole: x.role }))
-      .filter((x) => !selectedMembersForOrg.some((y) => y.user.id === x.user.id))
-  },
-  { immediate: true, deep: true }
+  initMembers
 )
+initMembers()
 
 const currentUsername = ref('')
 const openTeamMembers = ref([])