Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes for import page

Browse Source
This commit is contained in:
Hillel Coren 2016-09-25 21:13:14 +03:00
parent b624bb13c3
commit 0d3be448df
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/ImportController.php
View File

@ -31,6 +31,11 @@ class ImportController extends BaseController
} }
} }
if ( ! count($files)) {
Session::flash('error', trans('texts.select_file'));
return Redirect::to('/settings/' . ACCOUNT_IMPORT_EXPORT);
}
try { try {
if ($source === IMPORT_CSV) { if ($source === IMPORT_CSV) {
$data = $this->importService->mapCSV($files); $data = $this->importService->mapCSV($files);

5
app/Http/Middleware/QueryLogging.php
View File

@ -23,6 +23,7 @@ class QueryLogging
// Enable query logging for development // Enable query logging for development
if (Utils::isNinjaDev()) { if (Utils::isNinjaDev()) {
DB::enableQueryLog(); DB::enableQueryLog();
$timeStart = microtime(true);
} }
$response = $next($request); $response = $next($request);
@ -32,7 +33,9 @@ class QueryLogging
if (strstr($request->url(), '_debugbar') === false) { if (strstr($request->url(), '_debugbar') === false) {
$queries = DB::getQueryLog(); $queries = DB::getQueryLog();
$count = count($queries); $count = count($queries);
Log::info($request->method() . ' - ' . $request->url() . ": $count queries"); $timeEnd = microtime(true);
$time = $timeEnd - $timeStart;
Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time);
//Log::info($queries); //Log::info($queries);
} }
} }

1
resources/views/accounts/import_export.blade.php
View File

@ -92,6 +92,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
setFileTypesVisible();
setCheckboxesEnabled(); setCheckboxesEnabled();
}); });