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

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2016-08-02 03:50:20 -07:00
commit d6ba0b67f0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/UsersController.php
View file

@ -1221,7 +1221,7 @@ class UsersController extends Controller
$user->email = e($item["email"]); $user->email = e($item["email"]);
$user->employee_num = e($item["employee_number"]); $user->employee_num = e($item["employee_number"]);
$user->activated = 1; $user->activated = 1;
if ($request->has('location_id')) { if ($request->input('location_id')!='') {
$user->location_id = e($request->input('location_id')); $user->location_id = e($request->input('location_id'));
} }
$user->notes = 'Imported from LDAP'; $user->notes = 'Imported from LDAP';