diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 0f19ce268..ea67757fc 100755 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -373,12 +373,12 @@ public function update(UpdateUserRequest $request) /** * Activate admin - * @param $id + * @param Request $request * @return \Illuminate\Http\RedirectResponse */ - public function activateAdmin($id) + public function activateAdmin(Request $request) { - $admin = $this->user->find($id); + $admin = $this->user->find($request->id); if ($admin->active !== 0) { $admin->active = 0; @@ -393,12 +393,12 @@ public function activateAdmin($id) /** * Deactivate admin - * @param $id + * @param Request $request * @return \Illuminate\Http\RedirectResponse */ - public function deactivateAdmin($id) + public function deactivateAdmin(Request $request) { - $admin = $this->user->find($id); + $admin = $this->user->find($request->id); if ($admin->active !== 1) { $admin->active = 1; diff --git a/resources/views/school/admin-list.blade.php b/resources/views/school/admin-list.blade.php index 323fe2a3b..309b12b7e 100755 --- a/resources/views/school/admin-list.blade.php +++ b/resources/views/school/admin-list.blade.php @@ -37,15 +37,27 @@