lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixed issue where admin users could disable activation when editing their own profile

Browse source
This commit is contained in:
snipe 2018-10-04 02:18:20 -07:00
parent 890b613f71
commit 7a44da85a0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -331,16 +331,19 @@
@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;">
<input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled"> <input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled">
<!-- this is necessary because the field is disabled and will reset -->
<input type="hidden" name="activated" value="{{ $user->activated }}">
{{ 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;">
<input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled"> <input type="checkbox" value="1" name="activated" class="minimal disabled" checked="checked" disabled="disabled">
<!-- this is necessary because the field is disabled and will reset -->
<input type="hidden" name="activated" value="1">
{{ 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;">