Merge branch 'develop'

app/Http/Transformers/ImportsTransformer.php

@@ -29,7 +29,7 @@ class ImportsTransformer
             'header_row' => $import->header_row,
             'first_row'  => $import->first_row,
             'field_map'  => $import->field_map,
-
+            'process_url'=> route('api.imports.importFile', $import->id),
         ];
 
         return $array;

app/Models/Statuslabel.php

@@ -21,7 +21,7 @@ class Statuslabel extends SnipeModel
 
     protected $rules = array(
         'name'  => 'required|string|unique_undeleted',
-        'notes'   => 'string',
+        'notes'   => 'string|nullable',
         'deployable' => 'required',
         'pending' => 'required',
         'archived' => 'required',

build/mix-manifest.json

@@ -3,10 +3,6 @@
     "/css/AdminLTE.css": "/css/AdminLTE.css",
     "/css/app.css": "/css/app.css",
     "/css/overrides.css": "/css/overrides.css",
-    "/vue.js.map": "/vue.js.map",
-    "/css/AdminLTE.css.map": "/css/AdminLTE.css.map",
-    "/css/app.css.map": "/css/app.css.map",
-    "/css/overrides.css.map": "/css/overrides.css.map",
     "/public/css/dist/all.css": "/public/css/dist/all.css",
     "/public/js/dist/all.js": "/public/js/dist/all.js"
 }

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

@@ -67,7 +67,7 @@ tr {
 
 <script>
     export default {
-        props: ['file', 'customFieldUrl', 'importProcessUrl'],
+        props: ['file', 'customFieldUrl'],
         data() {
             return {
                 activeFile: this.file,
@@ -142,12 +142,6 @@ tr {
             this.populateSelect2ActiveItems();
         },
         computed: {
-            processUrl() {
-                // Because we need to pass a parameter to the laravel route function
-                // We get a url 'http://localhost/api/v1/imports/process/DUMMYTEXT'
-                // But we want to customize that to /api/v1/imports/process/this_file
-                return this.importProcessUrl.replace('DUMMYTEXT', this.file.id)
-            },
             columns() {
                 switch(this.options.importType) {
                     case 'asset':
@@ -175,7 +169,7 @@ tr {
             },
             postSave() {
                 this.statusText = "Processing...";
-                this.$http.post(this.processUrl, {
+                this.$http.post(this.file.process_url, {
                     'import-update': this.options.update,
                     'import-type': this.options.importType,
                     'column-mappings': this.columnMappings

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

@@ -36,9 +36,6 @@ th {
             };
         },
 
-        /**
-         * Prepare the component (Vue 2.x).
-         */
         mounted() {
             window.eventHub.$on('importErrors', this.updateImportErrors);
             this.fetchFiles();

resources/views/importer/import.blade.php

@@ -66,7 +66,6 @@
                                                     :key="currentFile.id"
                                                     :file="currentFile"
                                                     customFieldUrl="{{route('api.customfields.index')}}"
-                                                    importProcessUrl="{{route('api.imports.importFile','DUMMYTEXT')}}"
                                                     @alert="updateAlert(alert)">
                                     			</import-file>
                                     	</template>

resources/views/statuslabels/index.blade.php

@@ -48,7 +48,7 @@
     <p>{{ trans('admin/statuslabels/table.info') }}</p>
 
       <p><i class="fa fa-circle text-green"></i> <strong>{{ trans('admin/statuslabels/table.deployable') }}</strong>: {!!  trans('admin/statuslabels/message.help.deployable')  !!}</p>
-      <p><i class="fa fa-circle text-orange"></i> <strong>Pending</strong>{{ trans('admin/statuslabels/message.help.pending') }}</p>
+      <p><i class="fa fa-circle text-orange"></i> <strong>Pending</strong>: {{ trans('admin/statuslabels/message.help.pending') }}</p>
       <p><i class="fa fa-times text-red"></i> <strong>Undeployable</strong>: {{ trans('admin/statuslabels/message.help.undeployable') }}</p>
       <p><i class="fa fa-times text-red"></i> <strong>Archived</strong>: {{ trans('admin/statuslabels/message.help.archived') }}</p>