Skip to content

Commit 054e65b

Browse files
committed
Fix user deletion
1 parent 397172d commit 054e65b

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

app/Repositories/UserRepository.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public function update($id, array $data)
165165
*/
166166
public function delete($id)
167167
{
168-
if (Models\Server::where('owner', $id)->count() > 0) {
168+
if (Models\Server::where('owner_id', $id)->count() > 0) {
169169
throw new DisplayException('Cannot delete a user with active servers attached to thier account.');
170170
}
171171

@@ -177,10 +177,15 @@ public function delete($id)
177177
DB::beginTransaction();
178178

179179
try {
180-
Models\Permission::where('user_id', $id)->delete();
181-
Models\Subuser::where('user_id', $id)->delete();
182-
Models\User::destroy($id);
180+
foreach(Models\Subuser::with('permissions')->where('user_id', $id)->get() as &$subuser) {
181+
foreach($subuser->permissions as &$permission) {
182+
$permission->delete();
183+
}
184+
185+
$subuser->delete();
186+
}
183187

188+
Models\User::destroy($id);
184189
DB::commit();
185190

186191
return true;

0 commit comments

Comments
 (0)