Merge branch 'develop' into add-display-name-to-users-fixed

app/Http/Controllers/Api/AssetsController.php

@@ -146,6 +146,7 @@ class AssetsController extends Controller
                 'model.category',
                 'model.manufacturer',
                 'model.fieldset',
+                'model.depreciation',
                 'supplier'
             ); // it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.
 

app/Http/Controllers/Api/ImportController.php

@@ -195,7 +195,7 @@ class ImportController extends Controller
         // Run a backup immediately before processing
         if ($request->get('run-backup')) {
             Log::debug('Backup manually requested via importer');
-            Artisan::call('snipeit:backup', ['--filename' => 'pre-import-backup-'.date('Y-m-d-H:i:s')]);
+            Artisan::call('snipeit:backup', ['--filename' => 'pre-import-backup-'.date('Y-m-d-H-i-s')]);
         } else {
             Log::debug('NO BACKUP requested via importer');
         }

app/Http/Controllers/Api/SettingsController.php

@@ -51,7 +51,6 @@ class SettingsController extends Controller
                 })->slice(0, 10)->map(function ($item) use ($settings) {
                     return (object) [
                         'username'        => $item[$settings['ldap_username_field']][0] ?? null,
-                        'display_name' => $item[$settings['ldap_display_name']][0] ?? null,
                         'employee_number' => $item[$settings['ldap_emp_num']][0] ?? null,
                         'lastname'        => $item[$settings['ldap_lname_field']][0] ?? null,
                         'firstname'       => $item[$settings['ldap_fname_field']][0] ?? null,

app/Http/Controllers/Api/UsersController.php

@@ -64,7 +64,6 @@ class UsersController extends Controller
             'users.jobtitle',
             'users.last_login',
             'users.last_name',
-            'users.display_name',
             'users.locale',
             'users.location_id',
             'users.manager_id',
@@ -155,10 +154,6 @@ class UsersController extends Controller
             $users = $users->where('users.last_name', '=', $request->input('last_name'));
         }
 
-        if ($request->filled('display_name')) {
-            $users = $users->where('users.display_name', '=', $request->input('display_name'));
-        }
-
         if ($request->filled('employee_num')) {
             $users = $users->where('users.employee_num', '=', $request->input('employee_num'));
         }
@@ -289,7 +284,6 @@ class UsersController extends Controller
                     [
                         'last_name',
                         'first_name',
-                        'display_name',
                         'email',
                         'jobtitle',
                         'username',
@@ -515,10 +509,6 @@ class UsersController extends Controller
                     $user->username = $request->input('username');
                 }
 
-                if ($request->filled('display_name')) {
-                    $user->display_name = $request->input('display_name');
-                }
-
                 if ($request->filled('email')) {
                     $user->email = $request->input('email');
                 }