|
@@ -10,6 +10,7 @@ use Illuminate\Contracts\View\Factory;
|
|
use Illuminate\Contracts\View\View;
|
|
use Illuminate\Contracts\View\View;
|
|
use Illuminate\Http\RedirectResponse;
|
|
use Illuminate\Http\RedirectResponse;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Http\Request;
|
|
|
|
+use Illuminate\Support\Facades\Auth;
|
|
use Spatie\Permission\Models\Permission;
|
|
use Spatie\Permission\Models\Permission;
|
|
use Spatie\Permission\Models\Role;
|
|
use Spatie\Permission\Models\Role;
|
|
|
|
|
|
@@ -66,7 +67,8 @@ class RoleController extends Controller
|
|
|
|
|
|
$role = Role::create([
|
|
$role = Role::create([
|
|
'name' => $request->name,
|
|
'name' => $request->name,
|
|
- 'color' => $request->color
|
|
|
|
|
|
+ 'color' => $request->color,
|
|
|
|
+ 'power' => $request->power
|
|
]);
|
|
]);
|
|
|
|
|
|
if ($request->permissions) {
|
|
if ($request->permissions) {
|
|
@@ -96,6 +98,10 @@ class RoleController extends Controller
|
|
{
|
|
{
|
|
$this->checkPermission(self::EDIT_PERMISSION);
|
|
$this->checkPermission(self::EDIT_PERMISSION);
|
|
|
|
|
|
|
|
+ if(Auth::user()->roles[0]->power < $role->power){
|
|
|
|
+ return back()->with("error","You dont have enough Power to edit that Role");
|
|
|
|
+ }
|
|
|
|
+
|
|
$permissions = Permission::all();
|
|
$permissions = Permission::all();
|
|
|
|
|
|
return view('admin.roles.edit', compact('role', 'permissions'));
|
|
return view('admin.roles.edit', compact('role', 'permissions'));
|
|
@@ -111,6 +117,10 @@ class RoleController extends Controller
|
|
{
|
|
{
|
|
$this->checkPermission(self::EDIT_PERMISSION);
|
|
$this->checkPermission(self::EDIT_PERMISSION);
|
|
|
|
|
|
|
|
+ if(Auth::user()->roles[0]->power < $role->power){
|
|
|
|
+ return back()->with("error","You dont have enough Power to edit that Role");
|
|
|
|
+ }
|
|
|
|
+
|
|
if ($request->permissions) {
|
|
if ($request->permissions) {
|
|
if($role->id != 1){ //disable admin permissions change
|
|
if($role->id != 1){ //disable admin permissions change
|
|
$role->syncPermissions($request->permissions);
|
|
$role->syncPermissions($request->permissions);
|
|
@@ -201,6 +211,9 @@ class RoleController extends Controller
|
|
->editColumn('permissionscount', function ($query){
|
|
->editColumn('permissionscount', function ($query){
|
|
return $query->permissions_count;
|
|
return $query->permissions_count;
|
|
})
|
|
})
|
|
|
|
+ ->editColumn('power', function (Role $role){
|
|
|
|
+ return $role->power;
|
|
|
|
+ })
|
|
->rawColumns(['actions', 'name'])
|
|
->rawColumns(['actions', 'name'])
|
|
->make(true);
|
|
->make(true);
|
|
}
|
|
}
|