Reverted shift change to old migration

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

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

 
 use BookStack\Auth\Permissions\PermissionsRepo;
 use BookStack\Exceptions\PermissionsException;
 
 use BookStack\Auth\Permissions\PermissionsRepo;
 use BookStack\Exceptions\PermissionsException;


@@ -8,7 +10,6 @@ use Illuminate\Validation\ValidationException;
 
 class RoleController extends Controller
 {
 
 class RoleController extends Controller
 {

-

     protected $permissionsRepo;
 
     /**
     protected $permissionsRepo;
 
     /**


@@ -26,15 +27,17 @@ class RoleController extends Controller
     {
         $this->checkPermission('user-roles-manage');
         $roles = $this->permissionsRepo->getAllRoles();
     {
         $this->checkPermission('user-roles-manage');
         $roles = $this->permissionsRepo->getAllRoles();

+

         return view('settings.roles.index', ['roles' => $roles]);
     }
 
     /**
         return view('settings.roles.index', ['roles' => $roles]);
     }
 
     /**

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

      */
     public function create()
     {
         $this->checkPermission('user-roles-manage');
      */
     public function create()
     {
         $this->checkPermission('user-roles-manage');

+

         return view('settings.roles.create');
     }
 
         return view('settings.roles.create');
     }
 


@@ -46,16 +49,18 @@ class RoleController extends Controller
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [
             'display_name' => 'required|min:3|max:180',
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [
             'display_name' => 'required|min:3|max:180',

-            'description' => '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)
      * @throws PermissionsException
      */
     public function edit(string $id)


@@ -65,11 +70,13 @@ class RoleController extends Controller
         if ($role->hidden) {
             throw new PermissionsException(trans('errors.role_cannot_be_edited'));
         }
         if ($role->hidden) {
             throw new PermissionsException(trans('errors.role_cannot_be_edited'));
         }

+

         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)
      * @throws ValidationException
      */
     public function update(Request $request, string $id)


@@ -77,11 +84,12 @@ class RoleController extends Controller
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [
             'display_name' => 'required|min:3|max:180',
         $this->checkPermission('user-roles-manage');
         $this->validate($request, [
             'display_name' => 'required|min:3|max:180',

-            'description' => '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 +104,14 @@ 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);

+

         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 +122,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');
     }
 }