From a5abb3e6a684cb3cff34d46529f4d3b89b3d097d Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 28 Sep 2018 11:19:43 -0700 Subject: [PATCH] Fixes #6252 - activated flag not checked when editing active user --- resources/views/users/edit.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 04c532e62..79f76b974 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -330,19 +330,19 @@
@if (config('app.lock_passwords'))
- {{ Form::checkbox('activated', '1', old('activated', $user->activated),['class' => 'minimal', 'disabled'=>'disabled']) }} + activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled"> {{ trans('admin/users/general.activated_help_text') }}

{{ trans('general.feature_disabled') }}

@elseif ($user->id === Auth::user()->id)
- {{ Form::checkbox('activated', '1', old('activated', $user->activated),['class' => 'minimal', 'disabled'=>'disabled']) }} + activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled"> {{ trans('admin/users/general.activated_help_text') }}

{{ trans('admin/users/general.activated_disabled_help_text') }}

@else
- {{ Form::checkbox('activated', '1', old('activated', $user->activated),['class' => 'minimal', 'id' => 'user_activated' ]) }} + activated)) == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/users/general.activated_help_text') }}
@endif