ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #2352

Browse Source
This commit is contained in:
snipe
2016-10-12 12:50:30 -07:00
parent 8f4e016c01
commit 2350c1c15c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/UsersController.php
+1 -1
View File
@@ -814,7 +814,7 @@ class UsersController extends Controller
'phone' => trim(e($row[5])),
'jobtitle' => trim(e($row[6])),
'employee_num' => trim(e($row[7])),
//'company_id' => Company::getIdForUser($row[8]),
'company_id' => Company::getIdForUser($row[8]),
'permissions' => '{"user":1}',
'notes' => 'Imported user'
);
resources/views/users/import.blade.php
+2 -2
View File
@@ -32,9 +32,9 @@ Create a User
<p>
Upload a CSV file with one or more users. Passwords will be auto-generated. The CSV should have the <strong>first</strong> fields as: </p>
<p><strong>firstName,lastName, username, email, location_id, phone, jobtitle, employee_num</strong>. </p>
<p><strong>firstName,lastName, username, email, location_id, phone, jobtitle, employee_num, company_id</strong>. </p>
<p>Any additional fields to the right of those fields will be ignored. Email is optional, however users will not be able to recover their passwords or receive EULAs if you do not provide an email address.
<p>Any additional fields to the right of those fields will be ignored. Email is optional, however users will not be able to recover their passwords or receive EULAs if you do not provide an email address. If you wish to include a company association, you must reference the ID number of an existing company - companies will not be created on the fly.
</p>
@if (config('app.lock_passwords'))