Fix override perms orgs (#1536)
* Fix override perms orgs * remove useless card?
This commit is contained in:
parent
683b0f5c48
commit
a629d7f048
@ -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)">
|
||||
|
||||
@ -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([])
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user