DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/snipe/snipe-it

Browse source
This commit is contained in:
snipe 2019-05-02 15:20:52 -07:00
parent dc73dbfbfd dae26e0378
commit ce16eae508
5 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Console/Commands/LdapSync.php
View file

@ -208,8 +208,7 @@ class LdapSync extends Command
} }
} }
$user->notes = 'Imported from LDAP';
$user->ldap_import = 1; $user->ldap_import = 1;
$errors = ''; $errors = '';

3
app/Http/Controllers/ProfileController.php
View file

@ -49,6 +49,9 @@ class ProfileController extends Controller
$user->last_name = $request->input('last_name'); $user->last_name = $request->input('last_name');
$user->website = $request->input('website'); $user->website = $request->input('website');
$user->gravatar = $request->input('gravatar'); $user->gravatar = $request->input('gravatar');
$user->phone = $request->input('phone');
if (!config('app.lock_passwords')) { if (!config('app.lock_passwords')) {
$user->locale = $request->input('locale', 'en'); $user->locale = $request->input('locale', 'en');

2
app/Presenters/AssetPresenter.php
View file

@ -391,7 +391,7 @@ class AssetPresenter extends Presenter
public function eol_date() 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 = date_create($this->purchase_date);
date_add($date, date_interval_create_from_date_string($this->model->model->eol . ' months')); date_add($date, date_interval_create_from_date_string($this->model->model->eol . ' months'));
return date_format($date, 'Y-m-d'); return date_format($date, 'Y-m-d');

3
database/seeds/DatabaseSeeder.php
View file

@ -43,5 +43,8 @@ class DatabaseSeeder extends Seeder
\Log::info($output); \Log::info($output);
Model::reguard(); Model::reguard();
DB::table('imports')->truncate();
} }
} }

9
resources/views/account/profile.blade.php
View file

@ -58,6 +58,15 @@
</div> </div>
</div> </div>
<!-- Phone -->
<div class="form-group {{ $errors->has('phone') ? 'has-error' : '' }}">
<label class="col-md-3 control-label" for="phone">{{ trans('admin/users/table.phone') }}</label>
<div class="col-md-4">
<input class="form-control" type="text" name="phone" id="phone" value="{{ Input::old('phone', $user->phone) }}" />
{!! $errors->first('phone', '<span class="alert-msg">:message</span>') !!}
</div>
</div>
<!-- Website URL --> <!-- Website URL -->