From 3f1f2721d7c77c6611c626c821d00ff3b9f26ef4 Mon Sep 17 00:00:00 2001 From: Katrin Yordanova Date: Fri, 26 May 2023 14:51:45 +0300 Subject: [PATCH 1/2] Fix handle not unique issue on page layout copy --- client/web/compose/src/views/Admin/Pages/Builder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/web/compose/src/views/Admin/Pages/Builder.vue b/client/web/compose/src/views/Admin/Pages/Builder.vue index 2a385221f..d15acdf73 100644 --- a/client/web/compose/src/views/Admin/Pages/Builder.vue +++ b/client/web/compose/src/views/Admin/Pages/Builder.vue @@ -779,7 +779,7 @@ export default { layout.meta.title = `${layout.meta.title}` - this.createPageLayout(this.layout).then(({ layoutID }) => { + this.createPageLayout(layout).then(({ layoutID }) => { return this.fetchPageLayouts().then(() => { this.switchLayout(layoutID) this.toastSuccess(this.$t('notification:page.page-layout.clone.success')) From a91f5de736342a0fa4f63d7a7b8e8f706c6e822b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= Date: Mon, 29 May 2023 17:57:32 +0200 Subject: [PATCH 2/2] Add copy of prefix when cloning layout --- client/web/compose/src/views/Admin/Pages/Builder.vue | 8 ++++---- locale/en/corteza-webapp-compose/notification.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/web/compose/src/views/Admin/Pages/Builder.vue b/client/web/compose/src/views/Admin/Pages/Builder.vue index d15acdf73..efbb86b20 100644 --- a/client/web/compose/src/views/Admin/Pages/Builder.vue +++ b/client/web/compose/src/views/Admin/Pages/Builder.vue @@ -772,16 +772,16 @@ export default { this.processing = true const layout = { - ...this.layout, + ...this.layout.clone(), handle: '', weight: this.layouts.length + 1, } - layout.meta.title = `${layout.meta.title}` + layout.meta.title = `${this.$t('copyOf')}${layout.meta.title}` - this.createPageLayout(layout).then(({ layoutID }) => { + this.createPageLayout(layout).then(({ pageLayoutID }) => { return this.fetchPageLayouts().then(() => { - this.switchLayout(layoutID) + this.switchLayout(pageLayoutID) this.toastSuccess(this.$t('notification:page.page-layout.clone.success')) }) }).finally(() => { diff --git a/locale/en/corteza-webapp-compose/notification.yaml b/locale/en/corteza-webapp-compose/notification.yaml index 0521f4618..ac1ab8977 100644 --- a/locale/en/corteza-webapp-compose/notification.yaml +++ b/locale/en/corteza-webapp-compose/notification.yaml @@ -106,7 +106,7 @@ page: success: Layout saved failed: Failed to save layout clone: - success: Layout created + success: Layout cloned and selected failed: Failed to clone layout delete: success: Layout deleted