From bb00c331e457f66ad341dee7a7aebdb333d0afa4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 4 Jun 2021 22:36:30 +0100
Subject: [PATCH] Ordered entity permission roles by display name

Closes #2782
---
 app/Auth/Role.php                                 | 7 +++++--
 resources/views/form/entity-permissions.blade.php | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Auth/Role.php b/app/Auth/Role.php
index 629cd6a95..59b1f547c 100644
--- a/app/Auth/Role.php
+++ b/app/Auth/Role.php
@@ -92,7 +92,7 @@ class Role extends Model implements Loggable
     }
 
     /**
-     * Get all visible roles
+     * Get all visible roles.
      */
     public static function visible(): Collection
     {
@@ -104,7 +104,10 @@ class Role extends Model implements Loggable
      */
     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();
     }
 
     /**
diff --git a/resources/views/form/entity-permissions.blade.php b/resources/views/form/entity-permissions.blade.php
index 6cf5ab8bd..d3e89cc44 100644
--- a/resources/views/form/entity-permissions.blade.php
+++ b/resources/views/form/entity-permissions.blade.php
@@ -25,7 +25,7 @@
     <table permissions-table class="table permissions-table toggle-switch-list" style="{{ !$model->restricted ? 'display: none' : '' }}">
         <tr>
             <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') }}
                 <a href="#" permissions-table-toggle-all class="text-small ml-m text-primary">{{ trans('common.toggle_all') }}</a>
             </th>