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

Added city to bulk user importer

Browse source
This commit is contained in:
snipe 2020-07-21 16:49:54 -07:00
parent c17a06792a
commit b750f4754f
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
3 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -435,6 +435,10 @@ class UsersController extends Controller
if ($request->filled('department_id')) { if ($request->filled('department_id')) {
$update_array['department_id'] = $request->input('department_id'); $update_array['department_id'] = $request->input('department_id');
} }
if ($request->filled('city')) {
$update_array['city'] = $request->input('city');
}
if ($request->filled('company_id')) { if ($request->filled('company_id')) {
$update_array['company_id'] = $request->input('company_id'); $update_array['company_id'] = $request->input('company_id');
} }

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

@ -55,6 +55,15 @@
</div> </div>
</div> </div>
<!-- City -->
<div class="form-group{{ $errors->has('city') ? ' has-error' : '' }}">
<label class="col-md-3 control-label" for="city">{{ trans('general.city') }}</label>
<div class="col-md-4">
<input class="form-control" type="text" name="city" id="city" aria-label="city" />
{!! $errors->first('city', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>
</div>
<!-- activated --> <!-- activated -->
<div class="form-group"> <div class="form-group">
<div class="col-sm-3 control-label"> <div class="col-sm-3 control-label">

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

@ -142,6 +142,26 @@
<td class="text-nowrap">{{ trans('admin/users/table.name') }}</td> <td class="text-nowrap">{{ trans('admin/users/table.name') }}</td>
<td>{{ $user->present()->fullName() }}</td> <td>{{ $user->present()->fullName() }}</td>
</tr> </tr>
@if (($user->address) || ($user->city) || ($user->state) || ($user->country))
<tr>
<td class="text-nowrap">{{ trans('general.address') }}</td>
<td>
@if ($user->address)
{{ $user->address }} <br>
@endif
@if ($user->city)
{{ $user->city }}
@endif
@if ($user->state)
{{ $user->state }}
@endif
@if ($user->country)
{{ $user->country }}
@endif
@endif
<tr> <tr>
<td class="text-nowrap">{{ trans('admin/users/table.username') }}</td> <td class="text-nowrap">{{ trans('admin/users/table.username') }}</td>
<td>{{ $user->username }}</td> <td>{{ $user->username }}</td>