starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-31 18:28:54 +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/RoleController.php
+27 -6
View File
@@ -7,6 +7,7 @@ use App\Models\UserRole;
use Illuminate\Http\Request;
use App\Models\RoleExcludedCategory;
use App\Http\Controllers\BasePageController;
use Spatie\Permission\Models\Role;
class RoleController extends BasePageController
{
@@ -20,7 +21,7 @@ class RoleController extends BasePageController
$title = 'User Role List';
//get the user roles
$userroles = UserRole::getRoles();
$userroles = Role::all()->toArray();
$this->smarty->assign('userroles', $userroles);
@@ -49,7 +50,7 @@ class RoleController extends BasePageController
$title = 'User Roles';
// Get the user roles.
$userRoles = UserRole::getRoles();
$userRoles = Role::all()->toArray();
$roles = [];
foreach ($userRoles as $userRole) {
$roles[$userRole['id']] = $userRole['name'];
@@ -76,10 +77,30 @@ class RoleController extends BasePageController
case 'submit':
if (empty($request->input('id'))) {
$title = 'Add User Role';
$role = UserRole::addRole($request->all());
$role = Role::create([
'name' => $request->input('name'),
'apirequests' => $request->input('apirequests'),
'downloadrequests' => $request->input('downloadrequests'),
'defaultinvites' => $request->input('defaultinvites'),
'canpreview' => $request->input('canpreview'),
'hideads' => $request->input('hideads'),
'donation' => $request->input('donation'),
'addyears' => $request->input('addyears'),
'rate_limit' => $request->input('rate_limit'),
]);
} else {
$title = 'Update User Role';
$role = UserRole::updateRole($request->all());
$role = Role::query()->where('id', $request->input('id'))->update([
'name' => $request->input('name'),
'apirequests' => $request->input('apirequests'),
'downloadrequests' => $request->input('downloadrequests'),
'defaultinvites' => $request->input('defaultinvites'),
'canpreview' => $request->input('canpreview'),
'hideads' => $request->input('hideads'),
'donation' => $request->input('donation'),
'addyears' => $request->input('addyears'),
'rate_limit' => $request->input('rate_limit'),
]);
$request->merge(['exccat' => (! $request->has('exccat') || ! \is_array($request->input('exccat'))) ? [] : $request->input('exccat')]);
RoleExcludedCategory::addRoleCategoryExclusions($request->input('id'), $request->input('exccat'));
@@ -92,7 +113,7 @@ class RoleController extends BasePageController
default:
if ($request->has('id')) {
$title = 'User Roles Edit';
$role = UserRole::getRoleById($request->input('id'));
$role = Role::query()->where('id', $request->input('id'))->first();
$this->smarty->assign('role', $role);
$this->smarty->assign('roleexccat', RoleExcludedCategory::getRoleCategoryExclusion($request->input('id')));
}
@@ -124,7 +145,7 @@ class RoleController extends BasePageController
public function destroy(Request $request)
{
if ($request->has('id')) {
UserRole::deleteRole($request->input('id'));
Role::query()->where('id', $request->input('id'))->delete();
}
return redirect($request->server('HTTP_REFERER'));