starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +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/UserController.php
+5 -5
View File
@@ -3,12 +3,12 @@
namespace App\Http\Controllers\Admin;
use App\Models\User;
use App\Models\UserRole;
use App\Models\Invitation;
use App\Mail\AccountChange;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Mail;
use App\Http\Controllers\BasePageController;
use Spatie\Permission\Models\Role;
class UserController extends BasePageController
{
@@ -24,7 +24,7 @@ class UserController extends BasePageController
$title = 'User List';
$roles = [];
foreach (UserRole::getRoles() as $userRole) {
foreach (Role::all()->toArray() as $userRole) {
$roles[$userRole['id']] = $userRole['name'];
}
@@ -103,9 +103,9 @@ class UserController extends BasePageController
$action = $request->input('action') ?? 'view';
//get the user roles
$userRoles = UserRole::getRoles();
$userRoles = Role::all()->toArray();
$roles = [];
$defaultRole = User::ROLE_USER;
$defaultRole = 'User';
$defaultInvites = Invitation::DEFAULT_INVITES;
foreach ($userRoles as $r) {
$roles[$r['id']] = $r['name'];
@@ -149,7 +149,7 @@ class UserController extends BasePageController
User::updateUserRoleChangeDate($request->input('id'), $request->input('rolechangedate'));
}
if ($request->input('role') !== null) {
UserRole::query()->where('id', $request->input('role'))->value('name');
Role::query()->where('id', $request->input('role'))->value('name');
$email = $request->input('email') ?? $request->input('email');
Mail::to($email)->send(new AccountChange($request->input('id')));
}