github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix conditions crash when custom options component is used (#14233)

Browse Source 
Fixes #14189
This commit is contained in:
Rijk van Zanten
2022-06-30 18:56:17 -04:00
committed by GitHub
parent cef060a0fc
commit 3008d64c7c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/interfaces/_system/system-interface-options/system-interface-options.vue
View File

@@ -77,7 +77,6 @@ export default defineComponent({
const usesCustomComponent = computed(() => {
if (!selectedInterface.value) return false;
return selectedInterface.value.options && 'render' in selectedInterface.value.options;
});

4
app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-conditions.vue
View File

@@ -100,6 +100,9 @@ export default defineComponent({
const selectedInterface = getInterface(interfaceID.value);
if (!selectedInterface || !selectedInterface.options) return [];
// Indicates a custom vue component is used for the interface options
if ('render' in selectedInterface.options) return [];
let optionsObjectOrArray;
if (typeof selectedInterface.options === 'function') {
@@ -132,6 +135,7 @@ export default defineComponent({
} else {
optionsObjectOrArray = selectedInterface.options;
}
const optionsArray = Array.isArray(optionsObjectOrArray)
? optionsObjectOrArray
: [...optionsObjectOrArray.standard, ...optionsObjectOrArray.advanced];