Update role related classes, rename user_roles to roles where used

This commit is contained in:
DariusIII
2018-08-01 10:25:34 +02:00
parent 822904db10
commit 0e43ca5be7
13 changed files with 52 additions and 31 deletions
@@ -8,10 +8,10 @@ use App\Models\Release;
use Blacklight\SABnzbd;
use App\Models\Category;
use App\Models\Settings;
use App\Models\UserRole;
use Illuminate\Http\Request;
use Blacklight\utility\Utility;
use App\Http\Controllers\BasePageController;
use Spatie\Permission\Models\Role;
class SiteController extends BasePageController
{
@@ -214,7 +214,7 @@ class SiteController extends BasePageController
$usersbymonth = User::getUsersByMonth();
$this->smarty->assign('usersbymonth', $usersbymonth);
$usersbyrole = UserRole::getUsersByRole();
$usersbyrole = Role::query()->select(['name'])->withCount('users')->groupBy('name')->having('users_count', '>', 0)->orderBy('users_count', 'desc')->get();
$this->smarty->assign('usersbyrole', $usersbyrole);
$this->smarty->assign('totusers', 0);
$this->smarty->assign('totrusers', 0);