Finished migration of last angular code

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

diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php
index c565bb20adc2b62a8d12f75765a3011bc0b908c0..cd064e7e80675e47188d0b02644926f94cfb8769 100644 (file)
--- a/app/Http/Controllers/PermissionController.php
+++ b/app/Http/Controllers/PermissionController.php
@@ -3,7 +3,6 @@
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Repos\PermissionsRepo;
 use Illuminate\Http\Request;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Repos\PermissionsRepo;
 use Illuminate\Http\Request;

-use BookStack\Http\Requests;

 
 class PermissionController extends Controller
 {
 
 class PermissionController extends Controller
 {


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

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

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


@@ -62,11 +61,13 @@ 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);

+        if ($role->hidden) throw new PermissionsException(trans('errors.role_cannot_be_edited'));

         return view('settings/roles/edit', ['role' => $role]);
     }
 
         return view('settings/roles/edit', ['role' => $role]);
     }
 


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

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

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


@@ -100,7 +101,7 @@ 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);
         return view('settings/roles/delete', ['role' => $role, 'roles' => $roles]);
     }
         $roles->prepend($blankRole);
         return view('settings/roles/delete', ['role' => $role, 'roles' => $roles]);
     }


@@ -123,7 +124,7 @@ class PermissionController extends Controller
             return redirect()->back();
         }
 
             return redirect()->back();
         }
 

-        session()->flash('success', 'Role successfully deleted');
+        session()->flash('success', trans('settings.role_delete_success'));

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