Skip to content

fix: don't show inherited rule if there is a rule overwriting it #4714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
icewind1991 wants to merge 1 commit into from
+7 −2
Closed

fix: don't show inherited rule if there is a rule overwriting it #4714

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/components/SharingSidebarView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { showError } from '@nextcloud/dialogs'
import { Permission } from '@nextcloud/files'
import { t } from '@nextcloud/l10n'
import { generateUrl } from '@nextcloud/router'
import { nextTick, ref, useTemplateRef, watch } from 'vue'
import { computed, nextTick, ref, useTemplateRef, watch } from 'vue'
import NcAvatar from '@nextcloud/vue/components/NcAvatar'
import NcButton from '@nextcloud/vue/components/NcButton'
import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
Expand Down Expand Up @@ -48,6 +48,11 @@ const groupFolderId = ref<number>()
const aclBasePermission = ref<number>(Permission.ALL)
const list = ref<Rule[]>([])
const inheritedAcls = ref<Rule[]>([])
const notSetInheritedAcl = computed(() => {
return inheritedAcls
.value
.filter((rule) => list.value.find((r) => r.getUniqueMappingIdentifier() === rule.getUniqueMappingIdentifier()) === undefined)
});

// component state
const showAclCreate = ref(false)
Expand Down Expand Up @@ -359,7 +364,7 @@ async function changePermission(item: Rule, permission: number, state: number) {
</tr>
</tbody>
<tbody v-else>
<tr v-for="item in [...inheritedAcls, ...list]" :key="item.mappingType + '-' + item.mappingId">
<tr v-for="item in [...notSetInheritedAcl, ...list]" :key="item.mappingType + '-' + item.mappingId">
<td :title="getFullDisplayName(item.mappingDisplayName, item.mappingType)" class="username">
<NcAvatar :user="item.mappingId" :is-no-user="item.mappingType !== 'user'" :size="24" />
<span class="hidden-visually">{{ getFullDisplayName(item.mappingDisplayName, item.mappingType) }}</span>
Expand Down
Loading