From a40ff107e68800610e97220ae7c05ad4b2e603a0 Mon Sep 17 00:00:00 2001 From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:18:11 +0000 Subject: [PATCH] fix(nc-gui): disable hide nocodb branding in oss also update shared form --- packages/nc-gui/components/smartsheet/Form.vue | 8 ++++++-- packages/nc-gui/lang/en.json | 3 ++- .../pages/index/[typeOrId]/form/[viewId]/index/index.vue | 2 +- .../pages/index/[typeOrId]/form/[viewId]/index/survey.vue | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue index 6ef918d18c..445f4a70ad 100644 --- a/packages/nc-gui/components/smartsheet/Form.vue +++ b/packages/nc-gui/components/smartsheet/Form.vue @@ -330,7 +330,6 @@ function setFormData() { .filter((f) => !hiddenColTypes.includes(f.uidt) && !systemFieldsIds.value.includes(f.fk_column_id)) .sort((a, b) => a.order - b.order) .map((c) => ({ ...c, required: !!c.required })) - } function isRequired(_columnObj: Record, required = false) { @@ -1128,7 +1127,12 @@ useEventListener( } " /> - + + + + {{ $t('labels.hideNocodbBranding') }} diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json index 4c1c0b7a16..b5a4a473d4 100644 --- a/packages/nc-gui/lang/en.json +++ b/packages/nc-gui/lang/en.json @@ -1292,7 +1292,8 @@ "editingSystemKeyNotSupported": "Editing system key not supported", "notAvailableAtTheMoment": "Not available at the moment", "groupPasteIsNotSupportedOnLinksColumn": "Group paste operation is not supported on Links/LinkToAnotherRecord column", - "groupClearIsNotSupportedOnLinksColumn": "Group clear operation is not supported on Links/LinkToAnotherRecord column" + "groupClearIsNotSupportedOnLinksColumn": "Group clear operation is not supported on Links/LinkToAnotherRecord column", + "upgradeToEnterpriseEdition": "Upgrade to Enterprise Edition {extraInfo}" }, "error": { "scopesRequired": "Scopes required", diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue index 0d7311f6fc..6e1dc9e905 100644 --- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue +++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue @@ -235,7 +235,7 @@ const onDecode = async (scannedCodeValue: string) => { -
+
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue index a4dc2def87..80391b8e51 100644 --- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue +++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue @@ -454,7 +454,7 @@ onMounted(() => {
-
+