From a1dec34b8b1a3f4cd0d8f633697c8df372257059 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 2 Jun 2022 12:35:39 +0530 Subject: [PATCH 1/2] fix: assign validation for correct column(LTAR) re #2228 Signed-off-by: Pranav C --- .../nc-gui/components/project/spreadsheet/public/XcForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui/components/project/spreadsheet/public/XcForm.vue b/packages/nc-gui/components/project/spreadsheet/public/XcForm.vue index 8f7772fdcc..e668effaf5 100644 --- a/packages/nc-gui/components/project/spreadsheet/public/XcForm.vue +++ b/packages/nc-gui/components/project/spreadsheet/public/XcForm.vue @@ -376,7 +376,7 @@ export default { const col = this.meta.columns.find(c => c.id === column.colOptions.fk_child_column_id) if ((col && col.rqd && !col.cdf) || column.required) { - obj.localState[col.title] = { required } + obj.localState[column.title] = { required } } } else if (isVirtualCol(column) && column.required) { obj.virtual[column.title] = { From aaf3fb52c58c98e6fbd0fb1ed4bfc6499808b347 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 2 Jun 2022 14:09:54 +0530 Subject: [PATCH 2/2] fix: nested insert correction in belongs to re #2228 Signed-off-by: Pranav C --- .../project/spreadsheet/public/XcForm.vue | 25 +- .../en/setup-and-usages/usage-information.md | 30 +- packages/nocodb/package-lock.json | 294 ++++++++++++++---- packages/nocodb/package.json | 2 +- packages/nocodb/src/lib/Noco.ts | 4 + .../sql-data-mapper/lib/sql/BaseModelSqlv2.ts | 2 +- .../lib/meta/api/publicApis/publicMetaApis.ts | 23 +- packages/nocodb/src/lib/models/Project.ts | 7 + packages/nocodb/src/lib/models/User.ts | 3 + packages/nocodb/src/lib/utils/getInstance.ts | 47 +++ packages/nocodb/src/lib/utils/globals.ts | 3 +- 11 files changed, 333 insertions(+), 107 deletions(-) create mode 100644 packages/nocodb/src/lib/utils/getInstance.ts diff --git a/packages/nc-gui/components/project/spreadsheet/public/XcForm.vue b/packages/nc-gui/components/project/spreadsheet/public/XcForm.vue index e668effaf5..2930bf1167 100644 --- a/packages/nc-gui/components/project/spreadsheet/public/XcForm.vue +++ b/packages/nc-gui/components/project/spreadsheet/public/XcForm.vue @@ -128,18 +128,6 @@ > Field is required. - - -