From 70ce0d9ee6cda8e58f542ad1595257f514a28571 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 9 Apr 2023 14:06:29 -0700
Subject: [PATCH] Maintain activated state on editing a user

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Users/UsersController.php | 1 -
 resources/views/users/edit.blade.php           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 83f271362..7e95484f6 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -74,7 +74,6 @@ class UsersController extends Controller
         $permissions = $this->filterDisplayable($permissions);
 
         $user = new User;
-        $user->activated = 1;
 
         return view('users/edit', compact('groups', 'userGroups', 'permissions', 'userPermissions'))
             ->with('user', $user);
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index d7c956b22..a94f0734b 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -227,7 +227,7 @@
                               @else
                                   <!-- everything is normal - as you were -->
                                   <label class="form-control">
-                                      {{ Form::checkbox('activated', '1', old('activated'), ['id' => 'activated', 'checked'=> 'checked', 'aria-label'=>'update_real_loc']) }}
+                                      <input type="checkbox" value="1" name="activated"{{ ((old('activated') == '1') || ($user->activated) == '1') ? ' checked="checked"' : '' }} aria-label="activated" id="activated">
                                       {{ trans('admin/users/general.activated_help_text') }}
                                   </label>
                               @endif