github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-16 00:51:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Ordered entity permission roles by display name

Browse Source 
Closes #2782
This commit is contained in:
Dan Brown
2021-06-04 22:36:30 +01:00
parent 807f92b693
commit bb00c331e4
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Auth/Role.php
View File

@ -92,7 +92,7 @@ class Role extends Model implements Loggable
} }
/** /**
* Get all visible roles * Get all visible roles.
*/ */
public static function visible(): Collection public static function visible(): Collection
{ {
@ -104,7 +104,10 @@ class Role extends Model implements Loggable
*/ */
public static function restrictable(): Collection public static function restrictable(): Collection
{ {
return static::query()->where('system_name', '!=', 'admin')->get(); return static::query()
->where('system_name', '!=', 'admin')
->orderBy('display_name', 'asc')
->get();
} }
/** /**

2
resources/views/form/entity-permissions.blade.php
View File

@ -25,7 +25,7 @@
<table permissions-table class="table permissions-table toggle-switch-list" style="{{ !$model->restricted ? 'display: none' : '' }}"> <table permissions-table class="table permissions-table toggle-switch-list" style="{{ !$model->restricted ? 'display: none' : '' }}">
<tr> <tr>
<th>{{ trans('common.role') }}</th> <th>{{ trans('common.role') }}</th>
<th @if($model->isA('page')) colspan="3" @else colspan="4" @endif> <th colspan="{{ $model->isA('page') ? '3' : '4' }}">
{{ trans('common.actions') }} {{ trans('common.actions') }}
<a href="#" permissions-table-toggle-all class="text-small ml-m text-primary">{{ trans('common.toggle_all') }}</a> <a href="#" permissions-table-toggle-all class="text-small ml-m text-primary">{{ trans('common.toggle_all') }}</a>
</th> </th>