Skip to content

fix #4129 【コンテンツ】カスタムフィールドタイプ「グループ」でループ機能を利用しているとき、一度追加したグループを削除できない件を修正 #4404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaburk wants to merge 1 commit into
base: 5.2.x
Choose a base branch
from
+11 −3
Open

fix #4129 【コンテンツ】カスタムフィールドタイプ「グループ」でループ機能を利用しているとき、一度追加したグループを削除できない件を修正 #4404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/CustomEntries/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Comment thread
kaburk marked this conversation as resolved.
?>
<?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',
Expand Down
4 changes: 2 additions & 2 deletions ...bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomEntries/form_loop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
?>


Expand Down Expand Up @@ -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>
Expand Down
Loading