mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 21:24:13 -08:00
Merge pull request #10604 from inietov/fixes/column_activated_cannot_be_null
Fixes: Column activated cannot be null [sc-18528]
This commit is contained in:
commit
8add47739e
|
@ -484,7 +484,6 @@ class UsersController extends Controller
|
|||
$user->first_name = '';
|
||||
$user->last_name = '';
|
||||
$user->email = substr($user->email, ($pos = strpos($user->email, '@')) !== false ? $pos : 0);
|
||||
|
||||
$user->id = null;
|
||||
|
||||
// Get this user groups
|
||||
|
|
|
@ -200,7 +200,7 @@
|
|||
<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" aria-label="activated">
|
||||
<!-- this is necessary because the field is disabled and will reset -->
|
||||
<input type="hidden" name="activated" value="{{ $user->activated }}">
|
||||
<input type="hidden" name="activated" value="{{ (int)$user->activated }}">
|
||||
{{ trans('admin/users/general.activated_help_text') }}
|
||||
<p class="help-block">{{ trans('general.feature_disabled') }}</p>
|
||||
|
||||
|
|
Loading…
Reference in a new issue