|
@@ -52,7 +52,7 @@ class RoleController extends Controller
|
|
|
public function store(Request $request)
|
|
|
{
|
|
|
$request->validate([
|
|
|
- 'name' => 'nullable|string|max:191',
|
|
|
+ 'name' => 'required|string|max:191',
|
|
|
'color' => [
|
|
|
'required',
|
|
|
'regex:/^#([a-f0-9]{6}|[a-f0-9]{3})$/i'
|
|
@@ -67,7 +67,10 @@ class RoleController extends Controller
|
|
|
]);
|
|
|
|
|
|
if ($request->permissions) {
|
|
|
- $role->givePermissionTo($request->permissions);
|
|
|
+ $permissions = explode(",",$request->permissions);
|
|
|
+ foreach($permissions as $permission){
|
|
|
+ $role->givePermissionTo($permission);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return $role;
|
|
@@ -111,7 +114,7 @@ class RoleController extends Controller
|
|
|
$role = Role::findOrFail($id);
|
|
|
|
|
|
$request->validate([
|
|
|
- 'name' => 'nullable|string|max:191',
|
|
|
+ 'name' => 'required|string|max:191',
|
|
|
'color' => [
|
|
|
'required',
|
|
|
'regex:/^#([a-f0-9]{6}|[a-f0-9]{3})$/i'
|
|
@@ -120,11 +123,13 @@ class RoleController extends Controller
|
|
|
]);
|
|
|
|
|
|
if ($request->permissions) {
|
|
|
- $role->givePermissionTo($request->permissions);
|
|
|
+ $permissions = explode(",",$request->permissions);
|
|
|
+ $role->syncPermissions($permissions);
|
|
|
}
|
|
|
|
|
|
- $role->update($request->all());
|
|
|
- //TODO PERMISSIONS?
|
|
|
+
|
|
|
+ $role->update($request->except('permissions'));
|
|
|
+
|
|
|
return $role;
|
|
|
}
|
|
|
|