github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-27 10:58:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix M2O display inside M2M relations (#9533)

Browse Source 
* Fix M2O display inside M2M relations

* Fix fetching every time value changed
This commit is contained in:
José Varela
2021-11-24 21:02:07 +00:00
committed by GitHub
parent a53515914f
commit 6dc551b7db
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue
View File

@@ -194,15 +194,24 @@ export default defineComponent({
newValue !== currentItem.value?.[relatedPrimaryKeyField.value!.field] &&
(typeof newValue === 'string' || typeof newValue === 'number')
) {
fetchCurrent();
fetchCurrent(newValue);
}
// If the value isn't a primary key, the current value will be set by the editing
// handlers in useEdit()
if (newValue === null) {
else if (newValue === null) {
currentItem.value = null;
}
// If value is already fullfilled, let's fetch all necessary
// fields for display template
else if (
!currentItem.value &&
typeof newValue === 'object' &&
newValue[relatedPrimaryKeyField.value!.field]
) {
fetchCurrent(newValue[relatedPrimaryKeyField.value!.field]);
}
},
{ immediate: true }
);
@@ -231,7 +240,7 @@ export default defineComponent({
emit('input', item[relatedPrimaryKeyField.value.field]);
}
async function fetchCurrent() {
async function fetchCurrent(key: string | number) {
if (!relatedPrimaryKeyField.value || !relatedCollection.value) return;
loading.value = true;
@@ -244,8 +253,8 @@ export default defineComponent({
try {
const endpoint = relatedCollection.value.collection.startsWith('directus_')
? `/${relatedCollection.value.collection.substring(9)}/${props.value}`
: `/items/${relatedCollection.value.collection}/${encodeURIComponent(props.value!)}`;
? `/${relatedCollection.value.collection.substring(9)}/${key}`
: `/items/${relatedCollection.value.collection}/${encodeURIComponent(key!)}`;
const response = await api.get(endpoint, {
params: {