DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #6252 - activated flag not checked when editing active user

Browse source
This commit is contained in:
snipe 2018-09-28 11:18:33 -07:00
parent 75032def9e
commit ff824ec4db
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/views/users/edit.blade.php
View file

@ -330,19 +330,21 @@
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')) @if (config('app.lock_passwords'))
<div class="icheckbox disabled" style="padding-left: 10px;"> <div class="icheckbox disabled" style="padding-left: 10px;">
{{ Form::checkbox('activated', '1', old('activated', $user->activated),['class' => 'minimal', 'disabled'=>'disabled']) }} <input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled">
{{ trans('admin/users/general.activated_help_text') }} {{ trans('admin/users/general.activated_help_text') }}
<p class="help-block">{{ trans('general.feature_disabled') }}</p> <p class="help-block">{{ trans('general.feature_disabled') }}</p>
kjasdhv
</div> </div>
@elseif ($user->id === Auth::user()->id) @elseif ($user->id === Auth::user()->id)
<div class="icheckbox disabled" style="padding-left: 10px;"> <div class="icheckbox disabled" style="padding-left: 10px;">
{{ Form::checkbox('activated', '1', old('activated', $user->activated),['class' => 'minimal', 'disabled'=>'disabled']) }} <input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled">
{{ trans('admin/users/general.activated_help_text') }} {{ trans('admin/users/general.activated_help_text') }}
<p class="help-block">{{ trans('admin/users/general.activated_disabled_help_text') }}</p> <p class="help-block">{{ trans('admin/users/general.activated_disabled_help_text') }}</p>
</div> </div>
@else @else
<div style="padding-left: 10px;"> <div style="padding-left: 10px;">
{{ Form::checkbox('activated', '1', old('activated', $user->activated),['class' => 'minimal' ]) }} <input type="checkbox" value="1" name="activated" class="minimal" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }}>
{{ trans('admin/users/general.activated_help_text') }} {{ trans('admin/users/general.activated_help_text') }}
</div> </div>
@endif @endif