Removed parallel testing, updated predis

[bookstack] / app / Http / Controllers / RoleController.php

diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php
index e16a724a48c49fa419506a997ace27310af607b1..a9be19e0cc7276de07e3c682638caea80db18fc1 100644 (file)
--- a/app/Http/Controllers/RoleController.php
+++ b/app/Http/Controllers/RoleController.php
@@ -1,19 +1,20 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;

 
 use BookStack\Auth\Permissions\PermissionsRepo;
 
 use BookStack\Auth\Permissions\PermissionsRepo;

+use BookStack\Auth\Queries\RolesAllPaginatedAndSorted;
+use BookStack\Auth\Role;

 use BookStack\Exceptions\PermissionsException;
 use BookStack\Exceptions\PermissionsException;

+use BookStack\Util\SimpleListOptions;

 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
 class RoleController extends Controller
 {
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
 class RoleController extends Controller
 {

+    protected PermissionsRepo $permissionsRepo;

 
 

-    protected $permissionsRepo;
-
-    /**
-     * PermissionController constructor.
-     */

     public function __construct(PermissionsRepo $permissionsRepo)
     {
         $this->permissionsRepo = $permissionsRepo;
     public function __construct(PermissionsRepo $permissionsRepo)
     {
         $this->permissionsRepo = $permissionsRepo;


@@ -22,20 +23,49 @@ class RoleController extends Controller
     /**
      * Show a listing of the roles in the system.
      */
     /**
      * Show a listing of the roles in the system.
      */

-    public function list()
+    public function index(Request $request)

     {
         $this->checkPermission('user-roles-manage');
     {
         $this->checkPermission('user-roles-manage');

-        $roles = $this->permissionsRepo->getAllRoles();
-        return view('settings.roles.index', ['roles' => $roles]);
+
+        $listOptions = SimpleListOptions::fromRequest($request, 'roles')->withSortOptions([
+            'display_name' => trans('common.sort_name'),
+            'users_count' => trans('settings.roles_assigned_users'),
+            'permissions_count' => trans('settings.roles_permissions_provided'),
+            'created_at' => trans('common.sort_created_at'),
+            'updated_at' => trans('common.sort_updated_at'),
+        ]);
+
+        $roles = (new RolesAllPaginatedAndSorted())->run(20, $listOptions);
+        $roles->appends($listOptions->getPaginationAppends());
+
+        $this->setPageTitle(trans('settings.roles'));
+
+        return view('settings.roles.index', [
+            'roles'       => $roles,
+            'listOptions' => $listOptions,
+        ]);

     }
 
     /**
     }
 
     /**

-     * Show the form to create a new role
+     * Show the form to create a new role.

      */
      */

-    public function create()
+    public function create(Request $request)

     {
         $this->checkPermission('user-roles-manage');
     {
         $this->checkPermission('user-roles-manage');

-        return view('settings.roles.create');
+
+        /** @var ?Role $role */
+        $role = null;
+        if ($request->has('copy_from')) {
+            $role = Role::query()->find($request->get('copy_from'));
+        }
+
+        if ($role) {
+            $role->display_name .= ' (' . trans('common.copy') . ')';
+        }
+
+        $this->setPageTitle(trans('settings.role_create'));
+
+        return view('settings.roles.create', ['role' => $role]);

     }
 
     /**
     }
 
     /**


@@ -45,43 +75,45 @@ class RoleController extends Controller
     {
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [
     {
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [

-            'display_name' => 'required|min:3|max:180',
-            'description' => 'max:180'
+            'display_name' => ['required', 'min:3', 'max:180'],
+            'description'  => ['max:180'],

         ]);
 
         $this->permissionsRepo->saveNewRole($request->all());
         $this->showSuccessNotification(trans('settings.role_create_success'));
         ]);
 
         $this->permissionsRepo->saveNewRole($request->all());
         $this->showSuccessNotification(trans('settings.role_create_success'));

+

         return redirect('/settings/roles');
     }
 
     /**
      * Show the form for editing a user role.
         return redirect('/settings/roles');
     }
 
     /**
      * Show the form for editing a user role.

-     * @throws PermissionsException

      */
     public function edit(string $id)
     {
         $this->checkPermission('user-roles-manage');
         $role = $this->permissionsRepo->getRoleById($id);
      */
     public function edit(string $id)
     {
         $this->checkPermission('user-roles-manage');
         $role = $this->permissionsRepo->getRoleById($id);

-        if ($role->hidden) {
-            throw new PermissionsException(trans('errors.role_cannot_be_edited'));
-        }
+
+        $this->setPageTitle(trans('settings.role_edit'));
+

         return view('settings.roles.edit', ['role' => $role]);
     }
 
     /**
      * Updates a user role.
         return view('settings.roles.edit', ['role' => $role]);
     }
 
     /**
      * Updates a user role.

+     *

      * @throws ValidationException
      */
     public function update(Request $request, string $id)
     {
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [
      * @throws ValidationException
      */
     public function update(Request $request, string $id)
     {
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [

-            'display_name' => 'required|min:3|max:180',
-            'description' => 'max:180'
+            'display_name' => ['required', 'min:3', 'max:180'],
+            'description'  => ['max:180'],

         ]);
 
         $this->permissionsRepo->updateRole($id, $request->all());
         $this->showSuccessNotification(trans('settings.role_update_success'));
         ]);
 
         $this->permissionsRepo->updateRole($id, $request->all());
         $this->showSuccessNotification(trans('settings.role_update_success'));

+

         return redirect('/settings/roles');
     }
 
         return redirect('/settings/roles');
     }
 


@@ -96,12 +128,16 @@ class RoleController extends Controller
         $roles = $this->permissionsRepo->getAllRolesExcept($role);
         $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]);
         $roles->prepend($blankRole);
         $roles = $this->permissionsRepo->getAllRolesExcept($role);
         $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]);
         $roles->prepend($blankRole);

+
+        $this->setPageTitle(trans('settings.role_delete'));
+

         return view('settings.roles.delete', ['role' => $role, 'roles' => $roles]);
     }
 
     /**
      * Delete a role from the system,
      * Migrate from a previous role if set.
         return view('settings.roles.delete', ['role' => $role, 'roles' => $roles]);
     }
 
     /**
      * Delete a role from the system,
      * Migrate from a previous role if set.

+     *

      * @throws Exception
      */
     public function delete(Request $request, string $id)
      * @throws Exception
      */
     public function delete(Request $request, string $id)


@@ -112,10 +148,12 @@ class RoleController extends Controller
             $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id'));
         } catch (PermissionsException $e) {
             $this->showErrorNotification($e->getMessage());
             $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id'));
         } catch (PermissionsException $e) {
             $this->showErrorNotification($e->getMessage());

+

             return redirect()->back();
         }
 
         $this->showSuccessNotification(trans('settings.role_delete_success'));
             return redirect()->back();
         }
 
         $this->showSuccessNotification(trans('settings.role_delete_success'));

+

         return redirect('/settings/roles');
     }
 }
         return redirect('/settings/roles');
     }
 }