github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-29 16:28:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix deselect button not showing up for non-admin users

Browse Source 
Fixes #3265
This commit is contained in:
rijkvanzanten
2020-12-14 19:54:55 -05:00
parent 724dfe6aaa
commit 52b8334e39
3 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/interfaces/files/files.vue
View File

@@ -25,7 +25,7 @@
/>
</template>
<template #item-append="{ item }" v-if="!disabled">
<template #item-append="{ item }" v-show="!disabled">
<v-icon name="close" v-tooltip="$t('deselect')" class="deselect" @click.stop="deleteItem(item)" />
</template>
</v-table>
@@ -117,10 +117,7 @@ export default defineComponent({
setup(props, { emit }) {
const { collection, field, value, primaryKey, sortField } = toRefs(props);
const { junction, junctionCollection, relation, relationCollection, relationInfo } = useRelation(
collection,
field
);
const { junction, junctionCollection, relation, relationCollection, relationInfo } = useRelation(collection, field);
function emitter(newVal: any[] | null) {
emit('input', newVal);
@@ -180,12 +177,7 @@ export default defineComponent({
relatedPrimaryKey,
} = useEdit(value, relationInfo, emitter);
const { stageSelection, selectModalActive, selectionFilters } = useSelection(
value,
items,
relationInfo,
emitter
);
const { stageSelection, selectModalActive, selectionFilters } = useSelection(value, items, relationInfo, emitter);
const { showUpload, onUpload } = useUpload();

14
app/src/interfaces/many-to-many/many-to-many.vue
View File

@@ -30,7 +30,7 @@
/>
</template>
<template #item-append="{ item }" v-if="!disabled">
<template #item-append="{ item }" v-show="!disabled">
<v-icon name="close" v-tooltip="$t('deselect')" class="deselect" @click.stop="deleteItem(item)" />
</template>
</v-table>
@@ -118,10 +118,7 @@ export default defineComponent({
emit('input', newVal);
}
const { junction, junctionCollection, relation, relationCollection, relationInfo } = useRelation(
collection,
field
);
const { junction, junctionCollection, relation, relationCollection, relationInfo } = useRelation(collection, field);
const {
deleteItem,
@@ -154,12 +151,7 @@ export default defineComponent({
editModalActive,
} = useEdit(value, relationInfo, emitter);
const { stageSelection, selectModalActive, selectionFilters } = useSelection(
value,
items,
relationInfo,
emitter
);
const { stageSelection, selectModalActive, selectionFilters } = useSelection(value, items, relationInfo, emitter);
const { sort, sortItems, sortedItems } = useSort(sortField, fields, items, emitter);

16
app/src/interfaces/one-to-many/one-to-many.vue
View File

@@ -30,7 +30,7 @@
/>
</template>
<template #item-append="{ item }" v-if="!disabled">
<template #item-append="{ item }" v-show="!disabled">
<v-icon name="close" v-tooltip="$t('deselect')" class="deselect" @click.stop="deleteItem(item)" />
</template>
</v-table>
@@ -277,8 +277,7 @@ export default defineComponent({
fields.push(pkField);
}
if (props.sortField !== null && fields.includes(props.sortField) === false)
fields.push(props.sortField);
if (props.sortField !== null && fields.includes(props.sortField) === false) fields.push(props.sortField);
try {
const endpoint = relatedCollection.value.collection.startsWith('directus_')
@@ -389,12 +388,7 @@ export default defineComponent({
const hasPrimaryKey = pkField in edits;
const newValue = (props.value || []).map((item) => {
if (
typeof item === 'object' &&
pkField in item &&
pkField in edits &&
item[pkField] === edits[pkField]
) {
if (typeof item === 'object' && pkField in item && pkField in edits && item[pkField] === edits[pkField]) {
return edits;
}
@@ -431,9 +425,7 @@ export default defineComponent({
const pkField = relatedPrimaryKeyField.value.field;
return items.value
.filter((currentItem) => pkField in currentItem)
.map((currentItem) => currentItem[pkField]);
return items.value.filter((currentItem) => pkField in currentItem).map((currentItem) => currentItem[pkField]);
});
const selectionFilters = computed<Filter[]>(() => {