Fix item permissions not respected in drawer-item (#24045)

directus · Dec 2, 2024 · fb41400 · fb41400
1 parent 0bb3351
commit fb41400
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/.changeset/three-ladybugs-jam.md b/.changeset/three-ladybugs-jam.md
@@ -0,0 +1,5 @@
+---
+'@directus/app': patch
+---
+
+Fixed item permissions not respected in `drawer-item`
diff --git a/app/src/views/private/components/drawer-item.vue b/app/src/views/private/components/drawer-item.vue
@@ -102,13 +102,13 @@ const title = computed(() => {
 		: t('editing_in', { collection: collection.name });
 });
 
-const { fields: fieldsWithPermissions } = useItemPermissions(
+const { fields: fieldsWithPermissions, updateAllowed } = useItemPermissions(
 	collection,
 	primaryKey,
 	computed(() => props.primaryKey === '+'),
 );
 
-const { fields: relatedCollectionFields } = useItemPermissions(
+const { fields: relatedCollectionFields, updateAllowed: updateRelatedCollectionAllowed } = useItemPermissions(
 	relatedCollection as Ref<string>,
 	relatedPrimaryKey,
 	computed(() => props.primaryKey === '+'),
@@ -152,6 +152,14 @@ const templatePrimaryKey = computed(() =>
 
 const templateCollection = computed(() => relatedCollectionInfo.value || collectionInfo.value);
 
+const isSavable = computed(() => {
+	if (props.disabled) return false;
+	if (isNew.value) return true;
+	if (updateAllowed.value && !props.junctionField) return true;
+	if (updateAllowed.value && props.junctionField && updateRelatedCollectionAllowed.value) return true;
+	return false;
+});
+
 const {
 	template,
 	templateData,
@@ -391,7 +399,7 @@ function useActions() {
 
 		<template #actions>
 			<slot name="actions" />
-			<v-button v-tooltip.bottom="t('save')" icon rounded @click="save">
+			<v-button v-tooltip.bottom="t('save')" icon rounded :disabled="!isSavable" @click="save">
 				<v-icon name="check" />
 			</v-button>
 		</template>
@@ -406,7 +414,7 @@ function useActions() {
 			<div v-else class="drawer-item-order" :class="{ swap: swapFormOrder }">
 				<v-form
 					v-if="junctionField"
-					:disabled="disabled"
+					:disabled="disabled || (!updateRelatedCollectionAllowed && !isNew)"
 					:loading="loading"
 					:show-no-visible-fields="false"
 					:initial-values="initialValues?.[junctionField]"
@@ -421,7 +429,7 @@ function useActions() {
 
 				<v-form
 					v-model="internalEdits"
-					:disabled="disabled"
+					:disabled="disabled || (!updateAllowed && !isNew)"
 					:loading="loading"
 					:show-no-visible-fields="false"
 					:initial-values="initialValues"