diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php index cdd7740a41..47b5f58113 100755 --- a/app/Console/Commands/LdapSync.php +++ b/app/Console/Commands/LdapSync.php @@ -208,8 +208,7 @@ class LdapSync extends Command } } - - $user->notes = 'Imported from LDAP'; + $user->ldap_import = 1; $errors = ''; diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index daa10aa974..a255aa34b6 100755 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -49,6 +49,9 @@ class ProfileController extends Controller $user->last_name = $request->input('last_name'); $user->website = $request->input('website'); $user->gravatar = $request->input('gravatar'); + $user->phone = $request->input('phone'); + + if (!config('app.lock_passwords')) { $user->locale = $request->input('locale', 'en'); diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php index d971b09e39..689a87201a 100644 --- a/app/Presenters/AssetPresenter.php +++ b/app/Presenters/AssetPresenter.php @@ -391,7 +391,7 @@ class AssetPresenter extends Presenter public function eol_date() { - if (( $this->purchase_date ) && ( $this->model )) { + if (( $this->purchase_date ) && ( $this->model ) && ($this->model->model->eol) ) { $date = date_create($this->purchase_date); date_add($date, date_interval_create_from_date_string($this->model->model->eol . ' months')); return date_format($date, 'Y-m-d'); diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 85f3e599ad..0a1c97560f 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -43,5 +43,8 @@ class DatabaseSeeder extends Seeder \Log::info($output); Model::reguard(); + + DB::table('imports')->truncate(); + } } diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php index 18a8287035..49e29b05a6 100755 --- a/resources/views/account/profile.blade.php +++ b/resources/views/account/profile.blade.php @@ -58,6 +58,15 @@ + +
+ +
+ + {!! $errors->first('phone', ':message') !!} +
+
+