Update validation.php

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

diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php
index cd064e7e80675e47188d0b02644926f94cfb8769..9893d59935ff6d284d98d5e335e2b452089de15e 100644 (file)
--- a/app/Http/Controllers/PermissionController.php
+++ b/app/Http/Controllers/PermissionController.php
@@ -1,7 +1,7 @@
 <?php namespace BookStack\Http\Controllers;
 
 <?php namespace BookStack\Http\Controllers;
 

+use BookStack\Auth\Permissions\PermissionsRepo;

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

-use BookStack\Repos\PermissionsRepo;

 use Illuminate\Http\Request;
 
 class PermissionController extends Controller
 use Illuminate\Http\Request;
 
 class PermissionController extends Controller


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

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

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


@@ -26,7 +26,7 @@ class PermissionController 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]);

     }
 
     /**
     }
 
     /**


@@ -36,7 +36,7 @@ class PermissionController extends Controller
     public function createRole()
     {
         $this->checkPermission('user-roles-manage');
     public function createRole()
     {
         $this->checkPermission('user-roles-manage');

-        return view('settings/roles/create');
+        return view('settings.roles.create');

     }
 
     /**
     }
 
     /**


@@ -67,8 +67,10 @@ class PermissionController extends Controller
     {
         $this->checkPermission('user-roles-manage');
         $role = $this->permissionsRepo->getRoleById($id);
     {
         $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]);

     }
 
     /**
     }
 
     /**


@@ -76,6 +78,7 @@ class PermissionController extends Controller
      * @param $id
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @param $id
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector

+     * @throws PermissionsException

      */
     public function updateRole($id, Request $request)
     {
      */
     public function updateRole($id, Request $request)
     {


@@ -103,7 +106,7 @@ class PermissionController 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]);
+        return view('settings.roles.delete', ['role' => $role, 'roles' => $roles]);

     }
 
     /**
     }
 
     /**