Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap

Added option to disable backup in import

app/Http/Controllers/Api/ImportController.php

@@ -119,7 +119,14 @@ class ImportController extends Controller
     {
         $this->authorize('import');
         // Run a backup immediately before processing
+
+        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')) {

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=461ae9803574a5a52d43",
     "/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=edafd9b8d5c4f4218518",
     "/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"
+    "/css/dist/all.css": "/css/dist/all.css?id=32f6e6a70fdaa03a0d88",
+    "/js/dist/all.js": "/js/dist/all.js?id=bf5cd2065e997d7692e0",
+    "/css/build/all.css": "/css/build/all.css?id=32f6e6a70fdaa03a0d88",
+    "/js/build/all.js": "/js/build/all.js?id=bf5cd2065e997d7692e0"
 }

resources/assets/js/components/importer/importer-file.vue

@@ -1,9 +1,3 @@
-<style>
-tr {
-    padding-left:30px;
-}
-</style>
-
 <template>
     <div v-show="processDetail">
 
@@ -25,7 +19,7 @@ tr {
                         <label for="import-update">Update Existing Values?:</label>
                     </div>
                     <div class="col-md-7 col-xs-12">
-                    <input type="checkbox" name="import-update" v-model="options.update">
+                        <input type="checkbox" class="minimal" name="import-update" v-model="options.update">
                     </div>
                 </div>
                 <div class="dynamic-form-row">
@@ -33,7 +27,15 @@ tr {
                         <label for="send-welcome">Send Welcome Email for new Users?</label>
                     </div>
                     <div class="col-md-7 col-xs-12">
-                    <input type="checkbox" name="send-welcome" v-model="options.send_welcome">
+                        <input type="checkbox" class="minimal" name="send-welcome" v-model="options.send_welcome">
+                    </div>
+                </div>
+                <div class="dynamic-form-row">
+                    <div class="col-md-5 col-xs-12">
+                        <label for="run-backup">Backup before importing?</label>
+                    </div>
+                    <div class="col-md-7 col-xs-12">
+                        <input type="checkbox" class="minimal" name="run-backup" v-model="options.run_backup">
                     </div>
                 </div>
             </div>
@@ -237,6 +239,7 @@ tr {
                     'import-update': this.options.update,
                     'send-welcome': this.options.send_welcome,
                     'import-type': this.options.importType,
+                    'run-backup': this.options.run_backup,
                     'column-mappings': this.columnMappings
                 }).then( ({body}) => {
                     // Success