DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 22:37:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed #7046 - added user website url back into UI

Browse source
This commit is contained in:
snipe 2019-05-21 18:55:12 -07:00
parent 729e3eb70d
commit b2eacb147b
5 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/UsersController.php
View file

@ -278,6 +278,7 @@ class UsersController extends Controller
$user->activated = $request->input('activated', 0); $user->activated = $request->input('activated', 0);
$user->jobtitle = $request->input('jobtitle', null); $user->jobtitle = $request->input('jobtitle', null);
$user->phone = $request->input('phone'); $user->phone = $request->input('phone');
$user->website = $request->input('website', null);
$user->location_id = $request->input('location_id', null); $user->location_id = $request->input('location_id', null);
$user->company_id = Company::getIdForUser($request->input('company_id', null)); $user->company_id = Company::getIdForUser($request->input('company_id', null));
$user->manager_id = $request->input('manager_id', null); $user->manager_id = $request->input('manager_id', null);

1
app/Http/Transformers/UsersTransformer.php
View file

@ -35,6 +35,7 @@ class UsersTransformer
] : null, ] : null,
'jobtitle' => ($user->jobtitle) ? e($user->jobtitle) : null, 'jobtitle' => ($user->jobtitle) ? e($user->jobtitle) : null,
'phone' => ($user->phone) ? e($user->phone) : null, 'phone' => ($user->phone) ? e($user->phone) : null,
'website' => ($user->website) ? e($user->website) : null,
'address' => ($user->address) ? e($user->address) : null, 'address' => ($user->address) ? e($user->address) : null,
'city' => ($user->city) ? e($user->city) : null, 'city' => ($user->city) ? e($user->city) : null,
'state' => ($user->state) ? e($user->state) : null, 'state' => ($user->state) ? e($user->state) : null,

1
app/Models/User.php
View file

@ -69,6 +69,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
'email' => 'email|nullable', 'email' => 'email|nullable',
'password' => 'required|min:6', 'password' => 'required|min:6',
'locale' => 'max:10|nullable', 'locale' => 'max:10|nullable',
'website' => 'url|nullable',
]; ];
use Searchable; use Searchable;

9
resources/views/users/edit.blade.php
View file

@ -273,6 +273,15 @@
</div> </div>
</div> </div>
<!-- Website URL -->
<div class="form-group {{ $errors->has('website') ? ' has-error' : '' }}">
<label for="website" class="col-md-3 control-label">{{ trans('general.website') }}</label>
<div class="col-md-8">
<input class="form-control" type="text" name="website" id="website" value="{{ Input::old('website', $user->website) }}" />
{!! $errors->first('website', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div>
</div>
<!-- Address --> <!-- Address -->
<div class="form-group{{ $errors->has('address') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('address') ? ' has-error' : '' }}">
<label class="col-md-3 control-label" for="address">{{ trans('general.address') }}</label> <label class="col-md-3 control-label" for="address">{{ trans('general.address') }}</label>

7
resources/views/users/view.blade.php
View file

@ -193,6 +193,13 @@
</tr> </tr>
@endif @endif
@if ($user->website)
<tr>
<td class="text-nowrap">{{ trans('general.website') }}</td>
<td><a href="{{ $user->website }}" target="_blank">{{ $user->website }}</a></td>
</tr>
@endif
@if ($user->phone) @if ($user->phone)
<tr> <tr>
<td class="text-nowrap">{{ trans('admin/users/table.phone') }}</td> <td class="text-nowrap">{{ trans('admin/users/table.phone') }}</td>