Skip to content

Commit

Permalink
操作ログを削除する際、キャンセルをクリックするとローディングが止まらない問題を改善
Browse files Browse the repository at this point in the history
  • Loading branch information
ryuring committed Feb 23, 2024
1 parent 3c90806 commit 94b7dbb
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions plugins/bc-admin-third/templates/Admin/Utilities/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<?php echo __d('baser_core', 'baserCMSは、表示速度向上のため、サーバーサイドのキャッシュ機構を利用しています。<br>これによりテンプレートを直接編集した際など、変更内容が反映されない場合がありますので、その際には、サーバーサイドのキャッシュを削除します。') ?>
</p>
<?php echo $this->BcAdminForm->postLink(__d('baser_core', 'サーバーキャッシュを削除する'), ['controller' => 'utilities', 'action' => 'clear_cache'], [
'class' => 'bca-submit-token bca-btn',
'class' => 'bca-btn',
'data-bca-btn-type' => 'clear',
'confirm' => __d('baser_core', 'サーバーキャッシュを削除します。いいですか?')
]) ?>
Expand Down Expand Up @@ -61,7 +61,7 @@
'action' => 'assets_symlink'
],
[
'class' => 'bca-submit-token bca-btn',
'class' => 'bca-btn',
'data-bca-btn-type' => 'clear',
'confirm' => __d('baser_core', 'テーマ・プラグインへのシンボリックリンクを再作成します。本当によろしいですか?')
]) ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<?php if ($this->BcBaser->isAdminUser() && $dblogs->count()): ?>
<div class="submit clear bca-update-log__delete">
<?php echo $this->BcAdminForm->postLink(__d('baser_core', 'ログを全て削除'), ['action' => 'delete_all'], [
'class' => 'bca-btn bca-loading',
'class' => 'bca-btn',
'data-bca-btn-type' => 'delete',
'confirm' => __d('baser_core', '最近の動きのログを削除します。いいですか?')
]) ?>
Expand Down
2 changes: 1 addition & 1 deletion plugins/bc-admin-third/templates/element/toolbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@

<?php if ($this->BcToolbar->isAvailableClearCache()): ?>
<li>
<?php $this->BcBaser->link(
<?= $this->BcAdminForm->postLink(
__d('baser_core', 'キャッシュクリア'),
['prefix' => 'Admin', 'plugin' => 'BaserCore', 'controller' => 'Utilities', 'action' => 'clear_cache'],
['confirm' => __d('baser_core', 'キャッシュクリアします。いいですか?')]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class="bca-text-url" target="_blank" data-toggle="tooltip" data-placement="top"
['action' => 'delete', $tableId, $entity->id], [
'block' => true,
'confirm' => __d('baser_core', '{0} を本当に削除してもいいですか?', $entity->{$entity->custom_table->display_field}),
'class' => 'bca-submit-token button bca-btn bca-actions__item',
'class' => 'bca-btn bca-actions__item',
'data-bca-btn-type' => 'delete',
'data-bca-btn-size' => 'sm',
'data-bca-btn-color' => 'danger'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
['action' => 'delete', $entity->id], [
'block' => true,
'confirm' => __d('baser_core', "{0} を本当に削除してもいいですか?\n\n利用しているテーブルのフィールドもデータごと削除されてしまいますのでご注意ください。", $entity->title),
'class' => 'bca-submit-token button bca-btn bca-actions__item',
'class' => 'bca-btn bca-actions__item',
'data-bca-btn-type' => 'delete',
'data-bca-btn-size' => 'sm',
'data-bca-btn-color' => 'danger'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<?php echo $this->BcAdminForm->postLink(__d('baser_core', '削除'), ['action' => 'delete', $editorTemplate->id], [
'block' => true,
'confirm' => __d('baser_core', '{0} を本当に削除してもいいですか?', $editorTemplate->name),
'class' => 'bca-submit-token button bca-btn bca-actions__item',
'class' => 'bca-btn bca-actions__item',
'data-bca-btn-type' => 'delete',
'data-bca-btn-size' => 'sm',
'data-bca-btn-color' => 'danger'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"本当に現在のテーマ「{0}」にコピーしてもいいですか?\n既に存在するファイルは上書きされます。",
Cake\Utility\Inflector::camelize(\BaserCore\Utility\BcUtil::getCurrentTheme())
),
'class' => 'bca-submit-token bca-btn',
'class' => 'bca-btn',
'data-bca-btn-type' => 'save',
'data-bca-btn-size' => 'lg',
'data-bca-btn-width' => 'lg',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
'confirm' => __d('baser_core',
"本当に現在のテーマ「{0}」にコピーしてもいいですか?\n既に存在するファイルは上書きされます。",
Cake\Utility\Inflector::camelize(\BaserCore\Utility\BcUtil::getCurrentTheme())),
'class' => 'bca-submit-token bca-btn',
'class' => 'bca-btn',
'data-bca-btn-type' => 'save',
'data-bca-btn-size' => 'lg',
'data-bca-btn-width' => 'lg',
Expand Down

0 comments on commit 94b7dbb

Please sign in to comment.