Skip to content

[データベース] 各テンプレートで一時保存や公開前ラベルを初期表示画面（一覧画面）に表示 #2382

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
akagane99 wants to merge 4 commits into
base: master
Choose a base branch
from
+91 −155
Open

[データベース] 各テンプレートで一時保存や公開前ラベルを初期表示画面（一覧画面）に表示 #2382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5dc1295
refactor: データベース, ステータス表示＋ボタンの共通部品化、及びdefaultテンプレート対応
akagane99 Mar 5, 2026
810e1b2
add: データベース, tableテンプレートのステータスラベル表示対応
akagane99 Mar 5, 2026
e8cc38d
add: データベース, design-table-dlテンプレートのステータスラベル表示対応
akagane99 Mar 5, 2026
b8fdae7
add: データベース, card_02テンプレートのステータスラベル表示対応
akagane99 Mar 5, 2026
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
35 changes: 4 additions & 31 deletions resources/views/plugins/user/databases/card_02/card_common.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,37 +84,10 @@
])
</div>
<div class="text-right mb-1">
@if ($input->status == 2)
@can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]])
<span class="badge badge-warning align-bottom">承認待ち</span>
@endcan
@can('posts.approval',[[$input, $frame->plugin_name, $buckets]])
<form action="{{url('/')}}/plugin/databases/approval/{{$page->id}}/{{$frame_id}}/{{$input->id}}#frame-{{$frame_id}}" method="post" name="form_approval" class="d-inline">
{{ csrf_field() }}
<button type="submit" class="btn btn-primary btn-sm" onclick="javascript:return confirm('承認します。\nよろしいですか？');">
<i class="fas fa-check"></i> <span class="d-none d-sm-inline">承認</span>
</button>
</form>
@endcan
@endif
@can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]])
@if (!empty($input->expires_at) && $input->expires_at <= Carbon::now())
<span class="badge badge-secondary align-bottom">公開終了</span>
@endif

@if ($input->posted_at > Carbon::now())
<span class="badge badge-info align-bottom">公開前</span>
@endif
@endcan
@can('posts.update',[[$input, $frame->plugin_name, $buckets]])
@if ($input->status == 1)
<span class="badge badge-warning align-bottom">一時保存</span>
@endif

<button type="button" class="btn btn-success btn-sm ml-2" onclick="location.href='{{url('/')}}/plugin/databases/input/{{$page->id}}/{{$frame_id}}/{{$input->id}}#frame-{{$frame_id}}'">
<i class="far fa-edit"></i> 編集
</button>
@endcan
{{-- ステータス表示＋ボタン --}}
@include('plugins.user.databases.default.databases_include_status_and_button', [
'add_badge_class' => 'align-bottom',
])
</div>
</div>
</div>
Expand Down
36 changes: 5 additions & 31 deletions resources/views/plugins/user/databases/card_02/databases_detail.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,37 +69,11 @@
@can('role_update_or_approval', [[$inputs, $frame->plugin_name, $buckets]])
<div class="row mt-2">
<div class="col-12 text-right mb-1">
@if ($inputs->status == 2)
@can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]])
<span class="badge badge-warning align-bottom">承認待ち</span>
@endcan
@can('posts.approval',[[$inputs, $frame->plugin_name, $buckets]])
<form action="{{url('/')}}/plugin/databases/approval/{{$page->id}}/{{$frame_id}}/{{$inputs->id}}#frame-{{$frame_id}}" method="post" name="form_approval" class="d-inline">
{{ csrf_field() }}
<button type="submit" class="btn btn-primary btn-sm" onclick="javascript:return confirm('承認します。\nよろしいですか？');">
<i class="fas fa-check"></i> <span class="d-none d-sm-inline">承認</span>
</button>
</form>
@endcan
@endif
@can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]])
@if (!empty($inputs->expires_at) && $inputs->expires_at <= Carbon::now())
<span class="badge badge-secondary align-bottom">公開終了</span>
@endif

@if ($inputs->posted_at > Carbon::now())
<span class="badge badge-info align-bottom">公開前</span>
@endif
@endcan
@can('posts.update',[[$inputs, $frame->plugin_name, $buckets]])
@if ($inputs->status == 1)
<span class="badge badge-warning align-bottom">一時保存</span>
@endif

<button type="button" class="btn btn-success btn-sm ml-2" onclick="location.href='{{url('/')}}/plugin/databases/input/{{$page->id}}/{{$frame_id}}/{{$inputs->id}}#frame-{{$frame_id}}'">
<i class="far fa-edit"></i> 編集
</button>
@endcan
{{-- ステータス表示＋ボタン --}}
@include('plugins.user.databases.default.databases_include_status_and_button', [
'add_badge_class' => 'align-bottom',
'input' => $inputs,
])
</div>
</div>
@endcan
Expand Down
35 changes: 4 additions & 31 deletions resources/views/plugins/user/databases/default/databases.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,37 +72,10 @@
<div class="row mt-2">
<div class="col">
<div class="text-right">
@if ($input->status == 2)
@can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]])
<span class="badge badge-warning align-bottom">承認待ち</span>
@endcan
@can('posts.approval',[[$input, $frame->plugin_name, $buckets]])
<form action="{{url('/')}}/plugin/databases/approval/{{$page->id}}/{{$frame_id}}/{{$input->id}}#frame-{{$frame_id}}" method="post" name="form_approval" class="d-inline">
{{ csrf_field() }}
<button type="submit" class="btn btn-primary btn-sm" onclick="javascript:return confirm('承認します。\nよろしいですか？');">
<i class="fas fa-check"></i> <span class="d-none d-sm-inline">承認</span>
</button>
</form>
@endcan
@endif
@can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]])
@if (!empty($input->expires_at) && $input->expires_at <= Carbon::now())
<span class="badge badge-secondary align-bottom">公開終了</span>
@endif

@if ($input->posted_at > Carbon::now())
<span class="badge badge-info align-bottom">公開前</span>
@endif
@endcan
@can('posts.update',[[$input, $frame->plugin_name, $buckets]])
@if ($input->status == 1)
<span class="badge badge-warning align-bottom">一時保存</span>
@endif

<button type="button" class="btn btn-success btn-sm ml-2" onclick="location.href='{{url('/')}}/plugin/databases/input/{{$page->id}}/{{$frame_id}}/{{$input->id}}#frame-{{$frame_id}}'">
<i class="far fa-edit"></i> 編集
</button>
@endcan
{{-- ステータス表示＋ボタン --}}
@include('plugins.user.databases.default.databases_include_status_and_button', [
'add_badge_class' => 'align-bottom',
])

{{-- いいねボタン --}}
@include('plugins.common.like', [
Expand Down
36 changes: 5 additions & 31 deletions resources/views/plugins/user/databases/default/databases_detail.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,37 +63,11 @@
@can('role_update_or_approval', [[$inputs, $frame->plugin_name, $buckets]])
<div class="row mt-2">
<div class="col-12 text-right mb-1">
@if ($inputs->status == 2)
@can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]])
<span class="badge badge-warning align-bottom">承認待ち</span>
@endcan
@can('posts.approval',[[$inputs, $frame->plugin_name, $buckets]])
<form action="{{url('/')}}/plugin/databases/approval/{{$page->id}}/{{$frame_id}}/{{$inputs->id}}#frame-{{$frame_id}}" method="post" name="form_approval" class="d-inline">
{{ csrf_field() }}
<button type="submit" class="btn btn-primary btn-sm" onclick="javascript:return confirm('承認します。\nよろしいですか？');">
<i class="fas fa-check"></i> <span class="d-none d-sm-inline">承認</span>
</button>
</form>
@endcan
@endif
@can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]])
@if (!empty($inputs->expires_at) && $inputs->expires_at <= Carbon::now())
<span class="badge badge-secondary align-bottom">公開終了</span>
@endif

@if ($inputs->posted_at > Carbon::now())
<span class="badge badge-info align-bottom">公開前</span>
@endif
@endcan
@can('posts.update',[[$inputs, $frame->plugin_name, $buckets]])
@if ($inputs->status == 1)
<span class="badge badge-warning align-bottom">一時保存</span>
@endif

<button type="button" class="btn btn-success btn-sm ml-2" onclick="location.href='{{url('/')}}/plugin/databases/input/{{$page->id}}/{{$frame_id}}/{{$inputs->id}}#frame-{{$frame_id}}'">
<i class="far fa-edit"></i> 編集
</button>
@endcan
{{-- ステータス表示＋ボタン --}}
@include('plugins.user.databases.default.databases_include_status_and_button', [
'add_badge_class' => 'align-bottom',
'input' => $inputs,
])
</div>
</div>
@endcan
Expand Down
58 changes: 58 additions & 0 deletions resources/views/plugins/user/databases/default/databases_include_status_and_button.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{{--
* ステータス表示＋ボタン
*
* @author 牟田口 満 <akagane99@gmail.com>
* @category データベース・プラグイン
*
* @param $use_button 承認ボタン・編集ボタンを使う
* @param $add_badge_class ラベルのクラス追加
* @param $input データベースの1件のデータ
*
* // 暗黙で利用
* @param $frame
* @param $frame_id
* @param $buckets
* @param $page
--}}
@php
// 承認ボタン・編集ボタンを使うかどうかのフラグ
$use_button = $use_button ?? 1;
// ラベルのクラス追加
$add_badge_class = $add_badge_class ?? '';
@endphp

@if ($input->status == 2)
@can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]])
<span class="badge badge-warning {{$add_badge_class}}">承認待ち</span>
@endcan
@if ($use_button)
@can('posts.approval',[[$input, $frame->plugin_name, $buckets]])
<form action="{{url('/')}}/plugin/databases/approval/{{$page->id}}/{{$frame_id}}/{{$input->id}}#frame-{{$frame_id}}" method="post" name="form_approval" class="d-inline">
{{ csrf_field() }}
<button type="submit" class="btn btn-primary btn-sm" onclick="javascript:return confirm('承認します。\nよろしいですか？');">
<i class="fas fa-check"></i> <span class="d-none d-sm-inline">承認</span>
</button>
</form>
@endcan
@endif
@endif
@can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]])
@if (!empty($input->expires_at) && $input->expires_at <= Carbon::now())
<span class="badge badge-secondary {{$add_badge_class}}">公開終了</span>
@endif

@if ($input->posted_at > Carbon::now())
<span class="badge badge-info {{$add_badge_class}}">公開前</span>
@endif
@endcan
@can('posts.update',[[$input, $frame->plugin_name, $buckets]])
@if ($input->status == 1)
<span class="badge badge-warning {{$add_badge_class}}">一時保存</span>
@endif

@if ($use_button)
<button type="button" class="btn btn-success btn-sm ml-2" onclick="location.href='{{url('/')}}/plugin/databases/input/{{$page->id}}/{{$frame_id}}/{{$input->id}}#frame-{{$frame_id}}'">
<i class="far fa-edit"></i> 編集
</button>
@endif
@endcan
5 changes: 5 additions & 0 deletions resources/views/plugins/user/databases/design-table-dl/databases.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
<td class="{{$column->classname}}">
<a href="{{url('/')}}/plugin/databases/detail/{{$page->id}}/{{$frame_id}}/{{$input->id}}#frame-{{$frame_id}}">
@include('plugins.user.databases.default.databases_include_value')

{{-- ステータス表示のみ --}}
@include('plugins.user.databases.default.databases_include_status_and_button', [
'use_button' => 0,
])
</a>
</td>
@php
Expand Down
36 changes: 5 additions & 31 deletions resources/views/plugins/user/databases/design-table-dl/databases_detail.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,37 +66,11 @@
@can('role_update_or_approval', [[$inputs, $frame->plugin_name, $buckets]])
<div class="row mt-2">
<div class="col-12 text-right mb-1">
@if ($inputs->status == 2)
@can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]])
<span class="badge badge-warning align-bottom">承認待ち</span>
@endcan
@can('posts.approval',[[$inputs, $frame->plugin_name, $buckets]])
<form action="{{url('/')}}/plugin/databases/approval/{{$page->id}}/{{$frame_id}}/{{$inputs->id}}#frame-{{$frame_id}}" method="post" name="form_approval" class="d-inline">
{{ csrf_field() }}
<button type="submit" class="btn btn-primary btn-sm" onclick="javascript:return confirm('承認します。\nよろしいですか？');">
<i class="fas fa-check"></i> <span class="d-none d-sm-inline">承認</span>
</button>
</form>
@endcan
@endif
@can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]])
@if (!empty($inputs->expires_at) && $inputs->expires_at <= Carbon::now())
<span class="badge badge-secondary align-bottom">公開終了</span>
@endif

@if ($inputs->posted_at > Carbon::now())
<span class="badge badge-info align-bottom">公開前</span>
@endif
@endcan
@can('posts.update',[[$inputs, $frame->plugin_name, $buckets]])
@if ($inputs->status == 1)
<span class="badge badge-warning align-bottom">一時保存</span>
@endif

<button type="button" class="btn btn-success btn-sm ml-2" onclick="location.href='{{url('/')}}/plugin/databases/input/{{$page->id}}/{{$frame_id}}/{{$inputs->id}}#frame-{{$frame_id}}'">
<i class="far fa-edit"></i> 編集
</button>
@endcan
{{-- ステータス表示＋ボタン --}}
@include('plugins.user.databases.default.databases_include_status_and_button', [
'add_badge_class' => 'align-bottom',
'input' => $inputs,
])
</div>
</div>
@endcan
Expand Down
5 changes: 5 additions & 0 deletions resources/views/plugins/user/databases/table/databases.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@
<td class="{{$column->classname}}">
<a href="{{url('/')}}/plugin/databases/detail/{{$page->id}}/{{$frame_id}}/{{$input->id}}#frame-{{$frame_id}}">
@include('plugins.user.databases.default.databases_include_value')

{{-- ステータス表示のみ --}}
@include('plugins.user.databases.default.databases_include_status_and_button', [
'use_button' => 0,
])
</a>
</td>
@php
Expand Down