Skip to content

[アップロードファイル][ユーザ管理] 一覧のページャ指定が、別ページ遷移後でも残っている不具合対応 #2203

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

Merged
akagane99 merged 2 commits into from
May 28, 2025
Merged

[アップロードファイル][ユーザ管理] 一覧のページャ指定が、別ページ遷移後でも残っている不具合対応 #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52eb82d
bugfix: アップロードファイル, 一覧のページャ指定が、別ページ遷移後でも残っている不具合対応
akagane99 May 28, 2025
a709f89
bugfix: ユーザ管理, 一覧のページャ指定が、別ページ遷移後でも残っている不具合対応
akagane99 May 28, 2025
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
8 changes: 4 additions & 4 deletions resources/views/plugins/manage/menus_list.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
@endif
@if (Auth::user()->can('admin_user'))
@if (isset($plugin_name) && $plugin_name == 'user')
<a href="{{url('/')}}/manage/user" class="list-group-item active">ユーザ管理</a>
<a href="{{url('/')}}/manage/user?page=1" class="list-group-item active">ユーザ管理</a>
@else
<a href="{{url('/')}}/manage/user" class="list-group-item">ユーザ管理</a>
<a href="{{url('/')}}/manage/user?page=1" class="list-group-item">ユーザ管理</a>
@endif
@endif
@if (Auth::user()->can('admin_user'))
Expand Down Expand Up @@ -94,9 +94,9 @@
<div class="list-group-item bg-light">データ管理系</div>
@if (Auth::user()->can('admin_site'))
@if (isset($plugin_name) && $plugin_name == 'uploadfile')
<a href="{{url('/')}}/manage/uploadfile" class="list-group-item active">アップロードファイル</a>
<a href="{{url('/')}}/manage/uploadfile?page=1" class="list-group-item active">アップロードファイル</a>
@else
<a href="{{url('/')}}/manage/uploadfile" class="list-group-item">アップロードファイル</a>
<a href="{{url('/')}}/manage/uploadfile?page=1" class="list-group-item">アップロードファイル</a>
@endif
@endif
@if (Auth::user()->can('admin_site'))
Expand Down
2 changes: 1 addition & 1 deletion resources/views/plugins/manage/uploadfile/uploadfile_manage_tab.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@if ($function == "index")
<span class="nav-link"><span class="active">アップロードファイル一覧</span></span>
@else
<a href="{{url('/manage/uploadfile')}}" class="nav-link">アップロードファイル一覧</a></li>
<a href="{{url('/manage/uploadfile?page=1')}}" class="nav-link">アップロードファイル一覧</a></li>
@endif
</li>
<li role="presentation" class="nav-item">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/plugins/manage/user/user_manage_tab.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@if ($function == "index")
<span class="nav-link"><span class="active">ユーザ一覧</span></span>
@else
<a href="{{url('/manage/user')}}" class="nav-link">ユーザ一覧</a></li>
<a href="{{url('/manage/user?page=1')}}" class="nav-link">ユーザ一覧</a></li>
@endif
</li>

Expand Down