Improve admin operation

llilay · Nov 9, 2016 · d6dd8da · d6dd8da
1 parent 5e90800
commit d6dd8da
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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>