From 99cd552d5cfe0ce2dcbaed198f7ef8b058512aeb Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 13 Aug 2019 18:00:21 -0700 Subject: [PATCH] History importer fixes --- app/Http/Controllers/AssetsController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php index 0ed6a8a82..d23742032 100755 --- a/app/Http/Controllers/AssetsController.php +++ b/app/Http/Controllers/AssetsController.php @@ -570,15 +570,17 @@ class AssetsController extends Controller */ public function postImportHistory(Request $request) { + + if (!$request->hasFile('user_import_csv')) { + return back()->with('error', 'No file provided. Please select a file for import and try again. '); + } + if (!ini_get("auto_detect_line_endings")) { ini_set("auto_detect_line_endings", '1'); } $csv = Reader::createFromPath(Input::file('user_import_csv')); - $csv->setNewline("\r\n"); - //get the first row, usually the CSV header - //$headers = $csv->fetchOne(); - + $csv->setHeaderOffset(0); $results = $csv->getRecords(); $item = array(); $status = array();