From 1422ffcadd6f14da47bd087c1f451fc8ee83003f Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Fri, 28 Aug 2020 18:34:59 -0400
Subject: [PATCH] Fix detail delete

---
 api/src/services/items.ts                     |  2 +-
 app/src/composables/use-item/use-item.ts      | 40 +++++++++----------
 .../collections/routes/detail/detail.vue      |  6 +++
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/api/src/services/items.ts b/api/src/services/items.ts
index b54a218121..4448d0c15c 100644
--- a/api/src/services/items.ts
+++ b/api/src/services/items.ts
@@ -331,7 +331,7 @@ export default class ItemsService implements AbstractService {
 		const schemaInspector = SchemaInspector(this.knex);
 		const primaryKeyField = await schemaInspector.primary(this.collection);
 
-		if (this.accountability && this.accountability.admin !== false) {
+		if (this.accountability && this.accountability.admin !== true) {
 			const authorizationService = new AuthorizationService({
 				accountability: this.accountability,
 			});
diff --git a/app/src/composables/use-item/use-item.ts b/app/src/composables/use-item/use-item.ts
index c59ab2522a..4a99497177 100644
--- a/app/src/composables/use-item/use-item.ts
+++ b/app/src/composables/use-item/use-item.ts
@@ -177,24 +177,24 @@ export function useItem(collection: Ref<string>, primaryKey: Ref<string | number
 	}
 
 	async function remove(soft = false) {
-		if (soft) {
-			softDeleting.value = true;
-		} else {
-			deleting.value = true;
-		}
+		// if (soft) {
+		// 	softDeleting.value = true;
+		// } else {
+		deleting.value = true;
+		// }
 
 		try {
-			if (soft) {
-				if (!statusField.value || softDeleteStatus.value === null) {
-					throw new Error('[useItem] You cant soft-delete without a status field');
-				}
+			// if (soft) {
+			// 	if (!statusField.value || softDeleteStatus.value === null) {
+			// 		throw new Error('[useItem] You cant soft-delete without a status field');
+			// 	}
 
-				await api.patch(itemEndpoint.value, {
-					[statusField.value.field]: softDeleteStatus.value,
-				});
-			} else {
-				await api.delete(itemEndpoint.value);
-			}
+			// 	await api.patch(itemEndpoint.value, {
+			// 		[statusField.value.field]: softDeleteStatus.value,
+			// 	});
+			// } else {
+			await api.delete(itemEndpoint.value);
+			// }
 
 			item.value = null;
 
@@ -218,11 +218,11 @@ export function useItem(collection: Ref<string>, primaryKey: Ref<string | number
 
 			throw err;
 		} finally {
-			if (soft) {
-				softDeleting.value = false;
-			} else {
-				deleting.value = false;
-			}
+			// if (soft) {
+			// 	softDeleting.value = false;
+			// } else {
+			deleting.value = false;
+			// }
 		}
 	}
 
diff --git a/app/src/modules/collections/routes/detail/detail.vue b/app/src/modules/collections/routes/detail/detail.vue
index 1072db5e49..7c950d062e 100644
--- a/app/src/modules/collections/routes/detail/detail.vue
+++ b/app/src/modules/collections/routes/detail/detail.vue
@@ -330,11 +330,15 @@ export default defineComponent({
 		}
 
 		async function saveAndQuit() {
+			if (saveAllowed.value === false || hasEdits.value === false) return;
+
 			await save();
 			router.push(`/collections/${props.collection}`);
 		}
 
 		async function saveAndStay() {
+			if (saveAllowed.value === false || hasEdits.value === false) return;
+
 			const savedItem: Record<string, any> = await save();
 
 			revisionsDrawerDetail.value?.$data?.refresh?.();
@@ -347,6 +351,8 @@ export default defineComponent({
 		}
 
 		async function saveAndAddNew() {
+			if (saveAllowed.value === false || hasEdits.value === false) return;
+
 			await save();
 			router.push(`/collections/${props.collection}/+`);
 		}