From bd6b6a802a5bbfb53c79fc7ab33fadd04de8739d Mon Sep 17 00:00:00 2001
From: sakaguchi <sakaguchi@catchup.co.jp>
Date: Tue, 2 Jun 2026 10:37:26 +0900
Subject: [PATCH] =?UTF-8?q?fix=20#4129=20=E3=80=90=E3=82=B3=E3=83=B3?=
 =?UTF-8?q?=E3=83=86=E3=83=B3=E3=83=84=E3=80=91=E3=82=AB=E3=82=B9=E3=82=BF?=
 =?UTF-8?q?=E3=83=A0=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E3=82=BF?=
 =?UTF-8?q?=E3=82=A4=E3=83=97=E3=80=8C=E3=82=B0=E3=83=AB=E3=83=BC=E3=83=97?=
 =?UTF-8?q?=E3=80=8D=E3=81=A7=E3=83=AB=E3=83=BC=E3=83=97=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=82=92=E5=88=A9=E7=94=A8=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B?=
 =?UTF-8?q?=E3=81=A8=E3=81=8D=E3=80=81=E4=B8=80=E5=BA=A6=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=82=B0=E3=83=AB=E3=83=BC=E3=83=97=E3=82=92?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E4=BB=B6?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BcCustomContent/Admin/CustomEntries/edit.php       | 10 +++++++++-
 .../Admin/element/CustomEntries/form_loop.php          |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/CustomEntries/edit.php b/plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/CustomEntries/edit.php
index 53184d71c1..814db1720e 100644
--- a/plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/CustomEntries/edit.php
+++ b/plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/CustomEntries/edit.php
@@ -87,10 +87,18 @@ class="bca-text-url" target="_blank" data-toggle="tooltip" data-placement="top"
     ]) ?>
   </div>
   <div class="bca-actions__sub">
+    <?php
+      $displayValue = $entity->{$entity->custom_table->display_field} ?? '';
+      if (is_array($displayValue) || (is_object($displayValue) && !($displayValue instanceof \Stringable))) {
+        $displayValue = (string) $entity->id;
+      } else {
+        $displayValue = (string) $displayValue;
+      }
+    ?>
     <?php echo $this->BcAdminForm->postLink(__d('baser_core', '削除'),
     ['action' => 'delete', $tableId, $entity->id], [
       'block' => true,
-      'confirm' => __d('baser_core', '{0} を本当に削除してもいいですか？', $entity->{$entity->custom_table->display_field}),
+      'confirm' => __d('baser_core', '{0} を本当に削除してもいいですか？', $displayValue),
       'class' => 'bca-btn bca-actions__item',
       'data-bca-btn-type' => 'delete',
       'data-bca-btn-size' => 'sm',
diff --git a/plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomEntries/form_loop.php b/plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomEntries/form_loop.php
index 1121692a06..413c380cc2 100644
--- a/plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomEntries/form_loop.php
+++ b/plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomEntries/form_loop.php
@@ -20,7 +20,8 @@
  */
 if (empty($customLink->children)) return;
 // 空の場合の対策（既にデータを持っていて、ループに対応していないフィールドタイプに変更した場合など
-echo $this->BcAdminForm->hidden($customLink->name, ['value' => ''])
+echo $this->BcAdminForm->hidden($customLink->name, ['value' => '']);
+$this->BcAdminForm->unlockField($customLink->name);
 ?>
 
 
@@ -112,7 +113,6 @@
           ]) ?>
         </td>
       </tr>
-      <?php $this->BcAdminForm->unlockField("{$customLink->name}") ?>
       <?php $this->BcAdminForm->unlockField("{$customLink->name}.__loop-src__.{$child->name}") ?>
     <?php endforeach ?>
   </table>