Skip to content

Commit 41b0a70

Browse files
committed
Add roles_service test
1 parent e9f41c1 commit 41b0a70

File tree

5 files changed

+624
-388
lines changed

5 files changed

+624
-388
lines changed

app/Http/Controllers/RolesController.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,12 @@ public function store(Request $request)
7474
$role->save();
7575
$hierarchy = RoleHierarchy::select('hierarchy')
7676
->orderBy('hierarchy', 'desc')->first();
77-
$hierarchy = ((integer)$hierarchy['hierarchy']) + 1;
77+
if(empty($hierarchy)){
78+
$hierarchy = 0;
79+
}else{
80+
$hierarchy = $hierarchy['hierarchy'];
81+
}
82+
$hierarchy = ((integer)$hierarchy) + 1;
7883
$roleHierarchy = new RoleHierarchy();
7984
$roleHierarchy->role_id = $role->id;
8085
$roleHierarchy->hierarchy = $hierarchy;
@@ -134,13 +139,15 @@ public function update(Request $request, $id)
134139
public function destroy($id, Request $request)
135140
{
136141
$role = Role::where('id', '=', $id)->first();
142+
$roleHierarchy = RoleHierarchy::where('role_id', '=', $id)->first();
137143
$menuRole = Menurole::where('role_name', '=', $role->name)->first();
138144
if(!empty($menuRole)){
139145
$request->session()->flash('message', "Can't delete. Role has assigned one or more menu elements.");
140146
$request->session()->flash('back', 'roles.index');
141147
return view('dashboard.shared.universal-info');
142148
}else{
143149
$role->delete();
150+
$roleHierarchy->delete();
144151
$request->session()->flash('message', "Successfully deleted role");
145152
$request->session()->flash('back', 'roles.index');
146153
return view('dashboard.shared.universal-info');

0 commit comments

Comments
 (0)