From 0a315dcf74d38a55bb6bc8a4bb7a043d78f4087c Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Mon, 18 Apr 2022 19:11:30 -0400 Subject: [PATCH] Fix related primary key lookup in list-m2m (#12840) * Fix related primary key lookup in list-m2m Fixes #12836 * Apply the same fix for m2a --- app/src/interfaces/list-m2a/list-m2a.vue | 3 ++- app/src/interfaces/list-m2m/list-m2m.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/interfaces/list-m2a/list-m2a.vue b/app/src/interfaces/list-m2a/list-m2a.vue index 9cf6c58c45..1010c8fef6 100644 --- a/app/src/interfaces/list-m2a/list-m2a.vue +++ b/app/src/interfaces/list-m2a/list-m2a.vue @@ -266,6 +266,7 @@ function editItem(item: DisplayItem) { const relationPkField = relationInfo.value.relationPrimaryKeyFields[item[relationInfo.value.collectionField.field]].field; + const junctionField = relationInfo.value.junctionField.field; const junctionPkField = relationInfo.value.junctionPrimaryKeyField.field; newItem = false; @@ -279,7 +280,7 @@ function editItem(item: DisplayItem) { } else { if (!relationPkField) return; currentlyEditing.value = get(item, [junctionPkField], null); - relatedPrimaryKey.value = get(item, [junctionPkField, relationPkField], null); + relatedPrimaryKey.value = get(item, [junctionField, relationPkField], null); } } diff --git a/app/src/interfaces/list-m2m/list-m2m.vue b/app/src/interfaces/list-m2m/list-m2m.vue index e13f766335..21bafffa74 100644 --- a/app/src/interfaces/list-m2m/list-m2m.vue +++ b/app/src/interfaces/list-m2m/list-m2m.vue @@ -224,6 +224,7 @@ function editItem(item: DisplayItem) { if (!relationInfo.value) return; const relationPkField = relationInfo.value.relatedPrimaryKeyField.field; + const junctionField = relationInfo.value.junctionField.field; const junctionPkField = relationInfo.value.junctionPrimaryKeyField.field; newItem = false; @@ -236,7 +237,7 @@ function editItem(item: DisplayItem) { relatedPrimaryKey.value = null; } else { currentlyEditing.value = get(item, [junctionPkField], null); - relatedPrimaryKey.value = get(item, [junctionPkField, relationPkField], null); + relatedPrimaryKey.value = get(item, [junctionField, relationPkField], null); } }