From d6dd8daa0cfa575c806866b90829f28f4cbd2df6 Mon Sep 17 00:00:00 2001
From: zhengjinghua <jin114001251@gmail.com>
Date: Wed, 9 Nov 2016 17:34:00 +0800
Subject: [PATCH] Improve admin operation

---
 app/Http/Controllers/UsersController.php           | 1 -
 config/administrator.php                           | 2 +-
 resources/views/users/partials/basicinfo.blade.php | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index 29711dd0..54ababbe 100644
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -39,7 +39,6 @@ public function show($id)
         $user    = User::findOrFail($id);
         $topics  = Topic::whose($user->id)->withoutBoardTopics()->recent()->limit(20)->get();
         $replies = Reply::whose($user->id)->recent()->limit(20)->get();
-
         return view('users.show', compact('user', 'topics', 'replies'));
     }
 
diff --git a/config/administrator.php b/config/administrator.php
index 9ea41586..c64eedef 100644
--- a/config/administrator.php
+++ b/config/administrator.php
@@ -95,7 +95,7 @@
             }
         }
 
-        if (!Auth::check() || !Auth::user()->can('visit_admin')) {
+        if (!Auth::check() || !Auth::user()->can('visit_admin') || Auth::user()->roles->count() > 5) {
             return false;
         }
 
diff --git a/resources/views/users/partials/basicinfo.blade.php b/resources/views/users/partials/basicinfo.blade.php
index 64356bab..74e988a9 100644
--- a/resources/views/users/partials/basicinfo.blade.php
+++ b/resources/views/users/partials/basicinfo.blade.php
@@ -143,7 +143,7 @@
         </a>
         @endif
 
-        @if ($currentUser && Entrust::can('manage_users') && ($currentUser->id != $user->id))
+        @if ($currentUser && Entrust::can('manage_users') && ($currentUser->id != $user->id) && $currentUser->roles->count() < 5)
           <a data-method="post" class="btn btn-{{ $user->is_banned == 'yes' ? 'warning' : 'danger' }} btn-block" href="javascript:void(0);" data-url="{{ route('users.blocking', $user->id) }}" id="user-edit-button" onclick=" return confirm('{{ lang('Are you sure want to '. ($user->is_banned == 'yes' ? 'unblock' : 'block') . ' this User?') }}')">
             <i class="fa fa-times"></i> {{ $user->is_banned == 'yes' ? lang('Unblock User') : lang('Block User') }}
           </a>