Creating a create role request

AsgardCms · Oct 11, 2017 · b6ce374 · b6ce374
1 parent 8f86b43
commit b6ce374
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 11 deletions.
diff --git 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 → .../User/Http/Requests/CreateRoleRequest.php b/Modules/User/Http/Requests/RolesRequest.php → .../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
@@ -0,0 +1,28 @@
+<?php
+
+namespace Modules\User\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateRoleRequest extends FormRequest
+{
+    public function rules()
+    {
+        $role = $this->route('role');
+
+        return [
+            'name' => 'required',
+            'slug' => 'required|unique:roles,slug,' . $role->id . ',id',
+        ];
+    }
+
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function messages()
+    {
+        return [];
+    }
+}