Update some postpositional particles

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

diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php
index 9893d59935ff6d284d98d5e335e2b452089de15e..148ae5cd65a3049e421ea2b331f3bfa34f31ed4d 100644 (file)
--- a/app/Http/Controllers/PermissionController.php
+++ b/app/Http/Controllers/PermissionController.php
@@ -53,7 +53,7 @@ class PermissionController extends Controller
         ]);
 
         $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');
     }
 
         return redirect('/settings/roles');
     }
 


@@ -75,12 +75,13 @@ class PermissionController extends Controller
 
     /**
      * Updates a user role.
 
     /**
      * Updates a user role.

-     * @param $id

      * @param Request $request
      * @param Request $request

+     * @param $id

      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws PermissionsException
      * @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, [
     {
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [


@@ -89,7 +90,7 @@ class PermissionController extends Controller
         ]);
 
         $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');
     }
 
         return redirect('/settings/roles');
     }
 


@@ -112,22 +113,22 @@ 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
      * @param Request $request

+     * @param $id

      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */

-    public function deleteRole($id, Request $request)
+    public function deleteRole(Request $request, $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');
     }
 }