diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php index 464dee1e1b..f6520e33bd 100644 --- a/app/Http/Controllers/Api/ImportController.php +++ b/app/Http/Controllers/Api/ImportController.php @@ -119,7 +119,14 @@ class ImportController extends Controller { $this->authorize('import'); // Run a backup immediately before processing - Artisan::call('backup:run'); + + if ($request->has('run-backup')) { + \Log::debug('Backup manually requested via importer'); + Artisan::call('backup:run'); + } else { + \Log::debug('NO BACKUP requested via importer'); + } + $errors = $request->import(Import::find($import_id)); $redirectTo = "hardware.index"; switch ($request->get('import-type')) { diff --git a/public/css/build/all.css b/public/css/build/all.css index 4df58a0f10..a56df622ff 100644 Binary files a/public/css/build/all.css and b/public/css/build/all.css differ diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 4df58a0f10..4e056eb7e4 100644 Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ diff --git a/public/css/skins/skin-contrast.css b/public/css/skins/skin-contrast.css index a05a2aa0a5..b9b50499eb 100644 Binary files a/public/css/skins/skin-contrast.css and b/public/css/skins/skin-contrast.css differ diff --git a/public/css/skins/skin-contrast.css.map b/public/css/skins/skin-contrast.css.map index 42551fdad7..731b172f34 100644 Binary files a/public/css/skins/skin-contrast.css.map and b/public/css/skins/skin-contrast.css.map differ diff --git a/public/js/build/all.js b/public/js/build/all.js index 1118f20cc7..a83905b754 100644 Binary files a/public/js/build/all.js and b/public/js/build/all.js differ diff --git a/public/js/build/vue.js b/public/js/build/vue.js index 7f43b6f7ff..7200a00e80 100644 Binary files a/public/js/build/vue.js and b/public/js/build/vue.js differ diff --git a/public/js/build/vue.js.map b/public/js/build/vue.js.map index 9f7bf5d9f9..fb4fb1c165 100644 Binary files a/public/js/build/vue.js.map and b/public/js/build/vue.js.map differ diff --git a/public/js/dist/all.js b/public/js/dist/all.js index 1118f20cc7..88906aeade 100644 Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 8779e4bbe2..254e335b8a 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,11 +1,11 @@ { - "/js/build/vue.js": "/js/build/vue.js?id=684d1ab5c98c5b1b9d3c", + "/js/build/vue.js": "/js/build/vue.js?id=1d5d300bca67f973816c", "/css/AdminLTE.css": "/css/AdminLTE.css?id=56b8066cfbc70df10545", "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405", "/css/overrides.css": "/css/overrides.css?id=014ba62bc420467fd405", "/css/skins/skin-blue.css": "/css/skins/skin-blue.css?id=c28283a1d468e2337428", "/css/skins/skin-red.css": "/css/skins/skin-red.css?id=079dd6c501fa9ea60a98", - "/css/skins/skin-contrast.css": "/css/skins/skin-contrast.css?id=47303dc15032d3ecb343", + "/css/skins/skin-contrast.css": "/css/skins/skin-contrast.css?id=62e14190151e9efc9995", "/css/skins/skin-green.css": "/css/skins/skin-green.css?id=2c53f7ed585fcad563b2", "/css/skins/skin-green-dark.css": "/css/skins/skin-green-dark.css?id=cb34691dbbb72cae7f5f", "/css/skins/skin-black.css": "/css/skins/skin-black.css?id=1dfec89b8640b69dc0fc", @@ -18,13 +18,13 @@ "/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4", "/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860", "/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=59664dbd286988d2a438", - "/js/build/vue.js.map": "/js/build/vue.js.map?id=8fafb985154034fd882a", + "/js/build/vue.js.map": "/js/build/vue.js.map?id=f89fab0f3e7a8694efa9", "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2", "/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16", "/css/overrides.css.map": "/css/overrides.css.map?id=fe0a3186bd85efc442ca", "/css/skins/skin-blue.css.map": "/css/skins/skin-blue.css.map?id=129b9523e6ffd5683230", "/css/skins/skin-red.css.map": "/css/skins/skin-red.css.map?id=292dfa49bf2b6f23fa59", - "/css/skins/skin-contrast.css.map": "/css/skins/skin-contrast.css.map?id=141c0891e3ed15673d22", + "/css/skins/skin-contrast.css.map": "/css/skins/skin-contrast.css.map?id=bf37f812f0b6a109b5ce", "/css/skins/skin-green.css.map": "/css/skins/skin-green.css.map?id=50461604ff9b1934d580", "/css/skins/skin-green-dark.css.map": "/css/skins/skin-green-dark.css.map?id=988cf7da13d22c56bd8c", "/css/skins/skin-black.css.map": "/css/skins/skin-black.css.map?id=ad0bf20283280a01b34f", @@ -37,8 +37,8 @@ "/css/skins/skin-blue-dark.css.map": "/css/skins/skin-blue-dark.css.map?id=32784cb5d02773eb0e69", "/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=68b998638217fd08ef29", "/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=f90fda3cc0a48c048a9e", - "/css/dist/all.css": "/css/dist/all.css?id=41fe3b2990d453da1997", - "/js/dist/all.js": "/js/dist/all.js?id=8ec0e00558ab4b60acb8", - "/css/build/all.css": "/css/build/all.css?id=41fe3b2990d453da1997", - "/js/build/all.js": "/js/build/all.js?id=8ec0e00558ab4b60acb8" -} \ No newline at end of file + "/css/dist/all.css": "/css/dist/all.css?id=32f6e6a70fdaa03a0d88", + "/js/dist/all.js": "/js/dist/all.js?id=f46f0f728670ee80267a", + "/css/build/all.css": "/css/build/all.css?id=32f6e6a70fdaa03a0d88", + "/js/build/all.js": "/js/build/all.js?id=f46f0f728670ee80267a" +} diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/assets/js/components/importer/importer-file.vue index 6c39eb8763..0bac385075 100644 --- a/resources/assets/js/components/importer/importer-file.vue +++ b/resources/assets/js/components/importer/importer-file.vue @@ -1,9 +1,3 @@ - - @@ -11,30 +5,38 @@ tr { - - Import Type: + + Import Type: + + + + + + - - - - + + + Update Existing Values?: + + + + - - - - Update Existing Values?: - - - - - - - - Send Welcome Email for new Users? - - - + + + Send Welcome Email for new Users? + + + + + + + Backup before importing? + + + + - - - - Header Field - Import Field - Sample Value - - + + + + Header Field + Import Field + Sample Value + + - - - - - - {{ header }} - - - - - Do Not Import - - - - - {{ activeFile.first_row[index] }} - + + + + + + {{ header }} + + + + + Do Not Import + - - - - - Cancel - Import - - - - - - {{ this.statusText }} + + {{ activeFile.first_row[index] }} - - - + + + + + + Cancel + Import + + + + + + {{ this.statusText }} + + + + + + \ No newline at end of file
{{ activeFile.first_row[index] }}