From bf3cb73070ea32b8e819ad9c132f503caf29342c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 23 Jun 2015 15:05:11 -0700
Subject: [PATCH] Include location ID on user import

---
 app/controllers/admin/UsersController.php | 1 +
 app/views/backend/users/import.blade.php  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index 1144f365d8..2349724918 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -643,6 +643,7 @@ class UsersController extends AdminController
                                 'email' => $row[3],
                                 'password' => $pass,
                                 'activated' => $activated,
+                                'location_id' => $row[4],
                                 'permissions'	=> '{"user":1}',
                                 'notes'     => 'Imported user'
                             );
diff --git a/app/views/backend/users/import.blade.php b/app/views/backend/users/import.blade.php
index 639a0d8054..21ec07758c 100644
--- a/app/views/backend/users/import.blade.php
+++ b/app/views/backend/users/import.blade.php
@@ -38,7 +38,7 @@ Create a User ::
 			@endif
 
 			<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: <strong>firstName,lastName,username,email</strong>. 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.
+				Upload a CSV file with one or more users.  Passwords will be auto-generated.  The CSV should have the <strong>first</strong> fields as: <strong>firstName,lastName,username,email, location_id</strong>. 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>
 
             <div class="form-group {{ $errors->first('user_import_csv', 'has-error') }}">