DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #10604 from inietov/fixes/column_activated_cannot_be_null

Browse source 
Fixes: Column activated cannot be null [sc-18528]
This commit is contained in:
snipe 2022-02-02 12:21:31 -08:00 committed by GitHub
parent 2815e0d36e eac8e0bdba
commit 8add47739e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/Users/UsersController.php
View file

@ -484,7 +484,6 @@ class UsersController extends Controller
$user->first_name = ''; $user->first_name = '';
$user->last_name = ''; $user->last_name = '';
$user->email = substr($user->email, ($pos = strpos($user->email, '@')) !== false ? $pos : 0); $user->email = substr($user->email, ($pos = strpos($user->email, '@')) !== false ? $pos : 0);
$user->id = null; $user->id = null;
// Get this user groups // Get this user groups

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

@ -200,7 +200,7 @@
<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" aria-label="activated"> <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 --> <!-- 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') }} {{ 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>