diff --git a/Modules/User/Http/Controllers/Admin/RolesController.php b/Modules/User/Http/Controllers/Admin/RolesController.php index 2c865d9f6..7bfb4a03a 100644 --- a/Modules/User/Http/Controllers/Admin/RolesController.php +++ b/Modules/User/Http/Controllers/Admin/RolesController.php @@ -2,7 +2,7 @@ namespace Modules\User\Http\Controllers\Admin; -use Modules\User\Http\Requests\RolesRequest; +use Modules\User\Http\Requests\UpdateRoleRequest; use Modules\User\Permissions\PermissionManager; use Modules\User\Repositories\RoleRepository; @@ -45,11 +45,10 @@ public function create() /** * Store a newly created resource in storage. - * - * @param RolesRequest $request + * @param UpdateRoleRequest $request * @return Response */ - public function store(RolesRequest $request) + public function store(UpdateRoleRequest $request) { $data = $this->mergeRequestWithPermissions($request); @@ -77,12 +76,11 @@ public function edit($id) /** * Update the specified resource in storage. - * * @param int $id - * @param RolesRequest $request + * @param UpdateRoleRequest $request * @return Response */ - public function update($id, RolesRequest $request) + public function update($id, UpdateRoleRequest $request) { $data = $this->mergeRequestWithPermissions($request); diff --git a/Modules/User/Http/Requests/RolesRequest.php b/Modules/User/Http/Requests/CreateRoleRequest.php similarity index 68% rename from Modules/User/Http/Requests/RolesRequest.php rename to Modules/User/Http/Requests/CreateRoleRequest.php index 4c67e11d5..7c5fb0916 100644 --- a/Modules/User/Http/Requests/RolesRequest.php +++ b/Modules/User/Http/Requests/CreateRoleRequest.php @@ -4,15 +4,13 @@ use Illuminate\Foundation\Http\FormRequest; -class RolesRequest extends FormRequest +class CreateRoleRequest extends FormRequest { public function rules() { - $roleID = $this->route('roles'); - return [ 'name' => 'required', - 'slug' => 'required|unique:roles,slug,' . $roleID . ',id', + 'slug' => 'required|unique:roles,slug', ]; } diff --git a/Modules/User/Http/Requests/UpdateRoleRequest.php b/Modules/User/Http/Requests/UpdateRoleRequest.php new file mode 100644 index 000000000..67e5df98e --- /dev/null +++ b/Modules/User/Http/Requests/UpdateRoleRequest.php @@ -0,0 +1,28 @@ +route('role'); + + return [ + 'name' => 'required', + 'slug' => 'required|unique:roles,slug,' . $role->id . ',id', + ]; + } + + public function authorize() + { + return true; + } + + public function messages() + { + return []; + } +}