Fix build:js:watch not building at first launch in Docker

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

diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php
index 9893d59935ff6d284d98d5e335e2b452089de15e..1200d44ab69092ddcd3e498a2abf9ac961386f7a 100644 (file)
--- a/app/Http/Controllers/PermissionController.php
+++ b/app/Http/Controllers/PermissionController.php
@@ -2,7 +2,9 @@
 
 use BookStack\Auth\Permissions\PermissionsRepo;
 use BookStack\Exceptions\PermissionsException;
 
 use BookStack\Auth\Permissions\PermissionsRepo;
 use BookStack\Exceptions\PermissionsException;

+use Exception;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

+use Illuminate\Validation\ValidationException;

 
 class PermissionController extends Controller
 {
 
 class PermissionController extends Controller
 {


@@ -11,7 +13,6 @@ class PermissionController extends Controller
 
     /**
      * PermissionController constructor.
 
     /**
      * PermissionController constructor.

-     * @param \BookStack\Auth\Permissions\PermissionsRepo $permissionsRepo

      */
     public function __construct(PermissionsRepo $permissionsRepo)
     {
      */
     public function __construct(PermissionsRepo $permissionsRepo)
     {


@@ -31,7 +32,6 @@ class PermissionController extends Controller
 
     /**
      * Show the form to create a new role
 
     /**
      * Show the form to create a new role

-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View

      */
     public function createRole()
     {
      */
     public function createRole()
     {


@@ -41,29 +41,25 @@ class PermissionController extends Controller
 
     /**
      * Store a new role in the system.
 
     /**
      * Store a new role in the system.

-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector

      */
     public function storeRole(Request $request)
     {
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [
      */
     public function storeRole(Request $request)
     {
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [

-            'display_name' => 'required|min:3|max:200',
-            'description' => 'max:250'
+            'display_name' => 'required|min:3|max:180',
+            'description' => 'max:180'

         ]);
 
         $this->permissionsRepo->saveNewRole($request->all());
         ]);
 
         $this->permissionsRepo->saveNewRole($request->all());

-        session()->flash('success', trans('settings.role_create_success'));
+        $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.

-     * @param $id
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View

      * @throws PermissionsException
      */
      * @throws PermissionsException
      */

-    public function editRole($id)
+    public function editRole(string $id)

     {
         $this->checkPermission('user-roles-manage');
         $role = $this->permissionsRepo->getRoleById($id);
     {
         $this->checkPermission('user-roles-manage');
         $role = $this->permissionsRepo->getRoleById($id);


@@ -75,31 +71,26 @@ class PermissionController extends Controller
 
     /**
      * Updates a user role.
 
     /**
      * Updates a user role.

-     * @param $id
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     * @throws PermissionsException
+     * @throws ValidationException

      */
      */

-    public function updateRole($id, Request $request)
+    public function updateRole(Request $request, string $id)

     {
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [
     {
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [

-            'display_name' => 'required|min:3|max:200',
-            'description' => 'max:250'
+            'display_name' => 'required|min:3|max:180',
+            'description' => 'max:180'

         ]);
 
         $this->permissionsRepo->updateRole($id, $request->all());
         ]);
 
         $this->permissionsRepo->updateRole($id, $request->all());

-        session()->flash('success', trans('settings.role_update_success'));
+        $this->showSuccessNotification(trans('settings.role_update_success'));

         return redirect('/settings/roles');
     }
 
     /**
      * Show the view to delete a role.
      * Offers the chance to migrate users.
         return redirect('/settings/roles');
     }
 
     /**
      * Show the view to delete a role.
      * Offers the chance to migrate users.

-     * @param $id
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View

      */
      */

-    public function showDeleteRole($id)
+    public function showDeleteRole(string $id)

     {
         $this->checkPermission('user-roles-manage');
         $role = $this->permissionsRepo->getRoleById($id);
     {
         $this->checkPermission('user-roles-manage');
         $role = $this->permissionsRepo->getRoleById($id);


@@ -112,22 +103,20 @@ class PermissionController extends Controller
     /**
      * Delete a role from the system,
      * Migrate from a previous role if set.
     /**
      * Delete a role from the system,
      * Migrate from a previous role if set.

-     * @param $id
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @throws Exception

      */
      */

-    public function deleteRole($id, Request $request)
+    public function deleteRole(Request $request, string $id)

     {
         $this->checkPermission('user-roles-manage');
 
         try {
             $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id'));
         } catch (PermissionsException $e) {
     {
         $this->checkPermission('user-roles-manage');
 
         try {
             $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id'));
         } catch (PermissionsException $e) {

-            session()->flash('error', $e->getMessage());
+            $this->showErrorNotification($e->getMessage());

             return redirect()->back();
         }
 
             return redirect()->back();
         }
 

-        session()->flash('success', trans('settings.role_delete_success'));
+        $this->showSuccessNotification(trans('settings.role_delete_success'));

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