Update settings.php

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

diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php
index c565bb20adc2b62a8d12f75765a3011bc0b908c0..148ae5cd65a3049e421ea2b331f3bfa34f31ed4d 100644 (file)
--- a/app/Http/Controllers/PermissionController.php
+++ b/app/Http/Controllers/PermissionController.php
@@ -1,9 +1,8 @@
 <?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;
 use Illuminate\Http\Request;

-use BookStack\Http\Requests;

 
 class PermissionController extends Controller
 {
 
 class PermissionController extends Controller
 {


@@ -12,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)
     {


@@ -27,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]);

     }
 
     /**
     }
 
     /**


@@ -37,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');

     }
 
     /**
     }
 
     /**


@@ -54,7 +53,7 @@ class PermissionController extends Controller
         ]);
 
         $this->permissionsRepo->saveNewRole($request->all());
         ]);
 
         $this->permissionsRepo->saveNewRole($request->all());

-        session()->flash('success', 'Role successfully created');
+        $this->showSuccessNotification(trans('settings.role_create_success'));

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


@@ -62,21 +61,27 @@ class PermissionController extends Controller
      * Show the form for editing a user role.
      * @param $id
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      * Show the form for editing a user role.
      * @param $id
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View

+     * @throws PermissionsException

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

-        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]);

     }
 
     /**
      * 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
      * @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, [


@@ -85,7 +90,7 @@ class PermissionController extends Controller
         ]);
 
         $this->permissionsRepo->updateRole($id, $request->all());
         ]);
 
         $this->permissionsRepo->updateRole($id, $request->all());

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

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


@@ -100,30 +105,30 @@ class PermissionController extends Controller
         $this->checkPermission('user-roles-manage');
         $role = $this->permissionsRepo->getRoleById($id);
         $roles = $this->permissionsRepo->getAllRolesExcept($role);
         $this->checkPermission('user-roles-manage');
         $role = $this->permissionsRepo->getRoleById($id);
         $roles = $this->permissionsRepo->getAllRolesExcept($role);

-        $blankRole = $role->newInstance(['display_name' => 'Don\'t migrate users']);
+        $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]);

         $roles->prepend($blankRole);
         $roles->prepend($blankRole);

-        return view('settings/roles/delete', ['role' => $role, 'roles' => $roles]);
+        return view('settings.roles.delete', ['role' => $role, 'roles' => $roles]);

     }
 
     /**
      * 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', 'Role successfully deleted');
+        $this->showSuccessNotification(trans('settings.role_delete_success'));

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