Commit 88d4ec0b authored by cygnet's avatar cygnet

Merge branch 'develop' of git://github.com/viralsolani/laravel-adminpanel into develop

parents 168b450e 9852dc1d
...@@ -50,7 +50,6 @@ class PermissionController extends APIController ...@@ -50,7 +50,6 @@ class PermissionController extends APIController
return new PermissionResource($permission); return new PermissionResource($permission);
} }
/** /**
* Creates the Resource for Permission. * Creates the Resource for Permission.
* *
...@@ -111,14 +110,14 @@ class PermissionController extends APIController ...@@ -111,14 +110,14 @@ class PermissionController extends APIController
* validateUser Permission Requests. * validateUser Permission Requests.
* *
* @param Request $request * @param Request $request
* @param Integer $id * @param int $id
* *
* @return Validator object * @return Validator object
*/ */
public function validatePermission(Request $request,$id=0) public function validatePermission(Request $request, $id = 0)
{ {
$validation = Validator::make($request->all(), [ $validation = Validator::make($request->all(), [
'name' => 'required|max:191|unique:permissions,name,'.$id, 'name' => 'required|max:191|unique:permissions,name,'.$id,
'display_name' => 'required|max:191', 'display_name' => 'required|max:191',
]); ]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment