starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 17:28:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update role related classes, rename user_roles to roles where used

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/MenuController.php
+3 -2
View File
@@ -3,9 +3,9 @@
namespace App\Http\Controllers\Admin;
use App\Models\Menu;
use App\Models\UserRole;
use Illuminate\Http\Request;
use App\Http\Controllers\BasePageController;
use Spatie\Permission\Models\Role;
class MenuController extends BasePageController
{
@@ -35,6 +35,7 @@ class MenuController extends BasePageController
/**
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \Exception
*/
public function edit(Request $request)
@@ -42,7 +43,7 @@ class MenuController extends BasePageController
$this->setAdminPrefs();
// Get the user roles.
$userroles = UserRole::getRoles();
$userroles = Role::all()->toArray();
$roles = [];
foreach ($userroles as $r) {
$roles[$r['id']] = $r['name'];