X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/cd6572b61af2165133468d2562d04dffdca8fca8..refs/pull/1667/head:/app/Http/Controllers/PermissionController.php diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php index cd064e7e8..f19e7e763 100644 --- a/app/Http/Controllers/PermissionController.php +++ b/app/Http/Controllers/PermissionController.php @@ -1,7 +1,7 @@ checkPermission('user-roles-manage'); $roles = $this->permissionsRepo->getAllRoles(); - return view('settings/roles/index', ['roles' => $roles]); + return view('settings.roles.index', ['roles' => $roles]); } /** @@ -36,7 +36,7 @@ class PermissionController extends Controller public function createRole() { $this->checkPermission('user-roles-manage'); - return view('settings/roles/create'); + return view('settings.roles.create'); } /** @@ -67,17 +67,21 @@ class PermissionController extends Controller { $this->checkPermission('user-roles-manage'); $role = $this->permissionsRepo->getRoleById($id); - if ($role->hidden) throw new PermissionsException(trans('errors.role_cannot_be_edited')); - return view('settings/roles/edit', ['role' => $role]); + if ($role->hidden) { + throw new PermissionsException(trans('errors.role_cannot_be_edited')); + } + return view('settings.roles.edit', ['role' => $role]); } /** * Updates a user role. - * @param $id * @param Request $request + * @param $id * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws PermissionsException + * @throws \Illuminate\Validation\ValidationException */ - public function updateRole($id, Request $request) + public function updateRole(Request $request, $id) { $this->checkPermission('user-roles-manage'); $this->validate($request, [ @@ -103,17 +107,17 @@ class PermissionController extends Controller $roles = $this->permissionsRepo->getAllRolesExcept($role); $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]); $roles->prepend($blankRole); - return view('settings/roles/delete', ['role' => $role, 'roles' => $roles]); + return view('settings.roles.delete', ['role' => $role, 'roles' => $roles]); } /** * Delete a role from the system, * Migrate from a previous role if set. - * @param $id * @param Request $request + * @param $id * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function deleteRole($id, Request $request) + public function deleteRole(Request $request, $id) { $this->checkPermission('user-roles-manage');