diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte index 412da479f..c0f682b9c 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte @@ -41,6 +41,9 @@ trackError(error, Submit.AttributeDelete); } } + + $: isDeleteBtnDisabled = + selectedAttribute?.type === 'relationship' && selectedAttribute?.twoWay && !checked; Are you sure you want to delete '{selectedAttribute?.key}' from {$collection?.name}?

- {#if selectedAttribute?.type === 'relationship'} + {#if selectedAttribute?.type === 'relationship' && selectedAttribute?.twoWay}

Are you sure you want to delete reviews from Movie? This is a two way relationship @@ -61,13 +64,13 @@

This action is irreversible.

- Delete relationship between {selectedAttribute.relation} to {selectedAttribute.related} + Delete relationship between {selectedAttribute.key} to {selectedAttribute.twoWayKey}
{/if} - +
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte index 34126e60a..26a5e602f 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte @@ -23,7 +23,7 @@ teamPrefs.load($organization.$id); documentList = await getDocuments(); - displayNames = $teamPrefs?.displayNames ?? ['$id']; + displayNames = $teamPrefs?.displayNames?.[attribute?.relatedCollection] ?? ['$id']; if (!displayNames?.includes('$id')) { displayNames.unshift('$id'); }