From 553ea00aecdf054bb7a29100bc5ac399a77f40f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= Date: Fri, 8 Sep 2023 12:53:13 +0200 Subject: [PATCH] Fix required field checking in record blocks --- client/web/compose/src/views/Admin/Pages/Builder.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/web/compose/src/views/Admin/Pages/Builder.vue b/client/web/compose/src/views/Admin/Pages/Builder.vue index 15d15c53d..6c6a9be6b 100644 --- a/client/web/compose/src/views/Admin/Pages/Builder.vue +++ b/client/web/compose/src/views/Admin/Pages/Builder.vue @@ -711,12 +711,12 @@ export default { }) }, - validateModuleFieldSelection (module, page) { + checkRequiredRecordFields () { // Find all required fields - const req = new Set(module.fields.filter(({ isRequired = false }) => isRequired).map(({ name }) => name)) + const req = new Set(this.module.fields.filter(({ isRequired = false }) => isRequired).map(({ name }) => name)) // Check if all required fields are there - for (const b of page.blocks) { + for (const b of this.usedBlocks) { if (b.kind !== 'Record') { continue } @@ -739,7 +739,7 @@ export default { const { namespaceID } = this.namespace // Record blocks - if (this.module && !this.validateModuleFieldSelection(this.module, this.page)) { + if (this.module && !this.checkRequiredRecordFields()) { this.toastErrorHandler(this.$t('notification:page.saveFailedRequired'))() return }