From 8fc6a504c14b4317b6e5e7d3dce94ca2e751389c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BB=97=20V=C4=83n=20H=C3=B9ng?= Date: Tue, 3 Oct 2023 08:47:39 +0700 Subject: [PATCH 1/4] =?UTF-8?q?fix=20#1903=20=E3=82=B3=E3=83=B3=E3=83=86?= =?UTF-8?q?=E3=83=B3=E3=83=84=E4=B8=80=E8=A6=A7=EF=BC=88=E8=A1=A8=EF=BC=89?= =?UTF-8?q?=E3=82=B3=E3=83=94=E3=83=BC=E3=81=AE=E9=9A=9B=E3=81=AB=E3=82=B3?= =?UTF-8?q?=E3=83=94=E3=83=BC=E5=85=88=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=88?= =?UTF-8?q?=E3=83=AB=E3=81=AB=E3=80=8C=E3=81=AE=E3=82=B3=E3=83=94=E3=83=BC?= =?UTF-8?q?=E3=80=8D=E3=81=A8=E3=81=A4=E3=81=8B=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/Admin/element/Contents/index_row_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/bc-admin-third/templates/Admin/element/Contents/index_row_table.php b/plugins/bc-admin-third/templates/Admin/element/Contents/index_row_table.php index 66c31b1acf..da8392b23f 100644 --- a/plugins/bc-admin-third/templates/Admin/element/Contents/index_row_table.php +++ b/plugins/bc-admin-third/templates/Admin/element/Contents/index_row_table.php @@ -220,7 +220,7 @@ class="bca-btn-icon" - + From 68f3bc19d84a38fb2a98f62bf15a82a6534fb816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BB=97=20V=C4=83n=20H=C3=B9ng?= Date: Wed, 4 Oct 2023 08:59:15 +0700 Subject: [PATCH 2/4] =?UTF-8?q?fix=20#1903=20=E3=82=B3=E3=83=B3=E3=83=86?= =?UTF-8?q?=E3=83=B3=E3=83=84=E4=B8=80=E8=A6=A7=EF=BC=88=E8=A1=A8=EF=BC=89?= =?UTF-8?q?=E3=82=B3=E3=83=94=E3=83=BC=E3=81=AE=E9=9A=9B=E3=81=AB=E3=82=B3?= =?UTF-8?q?=E3=83=94=E3=83=BC=E5=85=88=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=88?= =?UTF-8?q?=E3=83=AB=E3=81=AB=E3=80=8C=E3=81=AE=E3=82=B3=E3=83=94=E3=83=BC?= =?UTF-8?q?=E3=80=8D=E3=81=A8=E3=81=A4=E3=81=8B=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/baser-core/src/Model/Table/ContentFoldersTable.php | 2 +- plugins/baser-core/src/Model/Table/PagesTable.php | 2 +- plugins/bc-blog/src/Model/Table/BlogContentsTable.php | 2 +- plugins/bc-content-link/src/Model/Table/ContentLinksTable.php | 2 +- plugins/bc-mail/src/Model/Table/MailContentsTable.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/baser-core/src/Model/Table/ContentFoldersTable.php b/plugins/baser-core/src/Model/Table/ContentFoldersTable.php index 2e7c736dd7..29b0dd6c71 100644 --- a/plugins/baser-core/src/Model/Table/ContentFoldersTable.php +++ b/plugins/baser-core/src/Model/Table/ContentFoldersTable.php @@ -171,7 +171,7 @@ public function copy(int $id, $newParentId, $newTitle, $newAuthorId, $newSiteId) $entity->content = new Content([ 'name' => $entity->content->name, 'parent_id' => $newParentId, - 'title' => $newTitle, + 'title' => $newTitle ?? $oldEntity->title . '_copy', 'author_id' => $newAuthorId, 'site_id' => $newSiteId, 'description' => $entity->content->description, diff --git a/plugins/baser-core/src/Model/Table/PagesTable.php b/plugins/baser-core/src/Model/Table/PagesTable.php index f44015c37d..60d83c411f 100644 --- a/plugins/baser-core/src/Model/Table/PagesTable.php +++ b/plugins/baser-core/src/Model/Table/PagesTable.php @@ -257,7 +257,7 @@ public function copy($id, $newParentId, $newTitle, $newAuthorId, $newSiteId = nu $page->content = new Content([ 'name' => $page->content->name, 'parent_id' => $newParentId, - 'title' => $newTitle, + 'title' => $newTitle ?? $oldPage->title . '_copy', 'author_id' => $newAuthorId, 'site_id' => $newSiteId, 'description' => $page->content->description, diff --git a/plugins/bc-blog/src/Model/Table/BlogContentsTable.php b/plugins/bc-blog/src/Model/Table/BlogContentsTable.php index b7f8e5082d..23ee1c3100 100755 --- a/plugins/bc-blog/src/Model/Table/BlogContentsTable.php +++ b/plugins/bc-blog/src/Model/Table/BlogContentsTable.php @@ -222,7 +222,7 @@ public function copy( $data->content = new Content([ 'name' => $name, 'parent_id' => $newParentId, - 'title' => $newTitle, + 'title' => $newTitle ?? $oldData->title . '_copy', 'author_id' => $newAuthorId, 'site_id' => $newSiteId, 'exclude_search' => false, diff --git a/plugins/bc-content-link/src/Model/Table/ContentLinksTable.php b/plugins/bc-content-link/src/Model/Table/ContentLinksTable.php index d79394a597..5725164a5a 100644 --- a/plugins/bc-content-link/src/Model/Table/ContentLinksTable.php +++ b/plugins/bc-content-link/src/Model/Table/ContentLinksTable.php @@ -102,7 +102,7 @@ public function copy(int $id, $newParentId, $newTitle, $newAuthorId, $newSiteId) $entity->content = new Content([ 'name' => $entity->content->name, 'parent_id' => $newParentId, - 'title' => $newTitle, + 'title' => $newTitle ?? $oldEntity->title . '_copy', 'author_id' => $newAuthorId, 'site_id' => $newSiteId, 'description' => $entity->content->description, diff --git a/plugins/bc-mail/src/Model/Table/MailContentsTable.php b/plugins/bc-mail/src/Model/Table/MailContentsTable.php index bef6455587..6d68cfd0f1 100755 --- a/plugins/bc-mail/src/Model/Table/MailContentsTable.php +++ b/plugins/bc-mail/src/Model/Table/MailContentsTable.php @@ -286,7 +286,7 @@ public function copy( $data->content = new Content([ 'name' => $name, 'parent_id' => $newParentId, - 'title' => $newTitle, + 'title' => $newTitle ?? $oldData->title . '_copy', 'author_id' => $newAuthorId, 'site_id' => $newSiteId, 'exclude_search' => false, From 0829fc4ecb2708ad8ee87607b19797218a43288b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BB=97=20V=C4=83n=20H=C3=B9ng?= Date: Thu, 5 Oct 2023 11:50:49 +0700 Subject: [PATCH 3/4] =?UTF-8?q?fix=20#1903=20=E3=82=B3=E3=83=B3=E3=83=86?= =?UTF-8?q?=E3=83=B3=E3=83=84=E4=B8=80=E8=A6=A7=EF=BC=88=E8=A1=A8=EF=BC=89?= =?UTF-8?q?=E3=82=B3=E3=83=94=E3=83=BC=E3=81=AE=E9=9A=9B=E3=81=AB=E3=82=B3?= =?UTF-8?q?=E3=83=94=E3=83=BC=E5=85=88=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=88?= =?UTF-8?q?=E3=83=AB=E3=81=AB=E3=80=8C=E3=81=AE=E3=82=B3=E3=83=94=E3=83=BC?= =?UTF-8?q?=E3=80=8D=E3=81=A8=E3=81=A4=E3=81=8B=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/bc-admin-third/src/js/admin/_lib/jquery.bcTree.js | 2 -- .../templates/Admin/element/Contents/index_row_table.php | 2 +- .../templates/Admin/element/Contents/index_setup_tree.php | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/bc-admin-third/src/js/admin/_lib/jquery.bcTree.js b/plugins/bc-admin-third/src/js/admin/_lib/jquery.bcTree.js index c1c9793cb1..3b3d4ef3aa 100644 --- a/plugins/bc-admin-third/src/js/admin/_lib/jquery.bcTree.js +++ b/plugins/bc-admin-third/src/js/admin/_lib/jquery.bcTree.js @@ -1004,7 +1004,6 @@ */ copyContent: function (parent, node) { var data = $.extend(true, {}, node.data.jstree); - data.contentTitle = bcI18n.bcTreeCopyTitle.sprintf(data.contentTitle); data.status = false; $.bcToken.check(function () { return $.ajax({ @@ -1013,7 +1012,6 @@ data: { content_id: data.contentId, entity_id: data.contentEntityId, - title: data.contentTitle, parent_id: data.contentParentId, site_id: data.contentSiteId, _csrfToken: $.bcToken.key, diff --git a/plugins/bc-admin-third/templates/Admin/element/Contents/index_row_table.php b/plugins/bc-admin-third/templates/Admin/element/Contents/index_row_table.php index da8392b23f..8e80941326 100644 --- a/plugins/bc-admin-third/templates/Admin/element/Contents/index_row_table.php +++ b/plugins/bc-admin-third/templates/Admin/element/Contents/index_row_table.php @@ -215,12 +215,12 @@ class="bca-btn-icon" ]) ?> +
- diff --git a/plugins/bc-admin-third/templates/Admin/element/Contents/index_setup_tree.php b/plugins/bc-admin-third/templates/Admin/element/Contents/index_setup_tree.php index dfe542a560..4fc94b1cdb 100644 --- a/plugins/bc-admin-third/templates/Admin/element/Contents/index_setup_tree.php +++ b/plugins/bc-admin-third/templates/Admin/element/Contents/index_setup_tree.php @@ -45,7 +45,7 @@ 'bcTreeAlertMessage6' => __d('baser_core', '追加に失敗しました。'), 'bcTreeInfoMessage1' => __d('baser_core', 'ゴミ箱は空です'), 'bcTreeInfoMessage2' => __d('baser_core', 'ゴミ箱より戻しました。一覧に遷移しますのでしばらくお待ち下さい。'), - 'bcTreeCopyTitle' => __d('baser_core', '%s のコピー'), + 'bcTreeCopyTitle' => __d('baser_core', '%s'), 'bcTreeAliasTitle' => __d('baser_core', '%s のエイリアス'), 'bcTreeUnNamedTitle' => __d('baser_core', '名称未設定'), 'bcTreeNewTitle' => __d('baser_core', '新しい %s'), From 3b9924b2197265ae6a8dc1aeece5924060615f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BB=97=20V=C4=83n=20H=C3=B9ng?= Date: Fri, 6 Oct 2023 08:06:18 +0700 Subject: [PATCH 4/4] =?UTF-8?q?fix=20#1903=20=E3=82=B3=E3=83=B3=E3=83=86?= =?UTF-8?q?=E3=83=B3=E3=83=84=E4=B8=80=E8=A6=A7=EF=BC=88=E8=A1=A8=EF=BC=89?= =?UTF-8?q?=E3=82=B3=E3=83=94=E3=83=BC=E3=81=AE=E9=9A=9B=E3=81=AB=E3=82=B3?= =?UTF-8?q?=E3=83=94=E3=83=BC=E5=85=88=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=88?= =?UTF-8?q?=E3=83=AB=E3=81=AB=E3=80=8C=E3=81=AE=E3=82=B3=E3=83=94=E3=83=BC?= =?UTF-8?q?=E3=80=8D=E3=81=A8=E3=81=A4=E3=81=8B=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/Admin/element/Contents/index_setup_tree.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/bc-admin-third/templates/Admin/element/Contents/index_setup_tree.php b/plugins/bc-admin-third/templates/Admin/element/Contents/index_setup_tree.php index 4fc94b1cdb..ba3a7e9dbb 100644 --- a/plugins/bc-admin-third/templates/Admin/element/Contents/index_setup_tree.php +++ b/plugins/bc-admin-third/templates/Admin/element/Contents/index_setup_tree.php @@ -45,7 +45,6 @@ 'bcTreeAlertMessage6' => __d('baser_core', '追加に失敗しました。'), 'bcTreeInfoMessage1' => __d('baser_core', 'ゴミ箱は空です'), 'bcTreeInfoMessage2' => __d('baser_core', 'ゴミ箱より戻しました。一覧に遷移しますのでしばらくお待ち下さい。'), - 'bcTreeCopyTitle' => __d('baser_core', '%s'), 'bcTreeAliasTitle' => __d('baser_core', '%s のエイリアス'), 'bcTreeUnNamedTitle' => __d('baser_core', '名称未設定'), 'bcTreeNewTitle' => __d('baser_core', '新しい %s'),