DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-06 11:27:32 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-07-14 08:26:12 +01:00
parent 43d419f051 15bb943210
commit db8c37cd5b
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Http/Controllers/Api/UsersController.php
View file

@ -78,12 +78,6 @@ class UsersController extends Controller
$users = Company::scopeCompanyables($users); $users = Company::scopeCompanyables($users);
if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) {
$users = $users->onlyTrashed();
} elseif (($request->filled('all')) && ($request->input('all') == 'true')) {
$users = $users->withTrashed();
}
if ($request->filled('activated')) { if ($request->filled('activated')) {
$users = $users->where('users.activated', '=', $request->input('activated')); $users = $users->where('users.activated', '=', $request->input('activated'));
} }
@ -272,6 +266,12 @@ class UsersController extends Controller
break; break;
} }
if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) {
$users = $users->onlyTrashed();
} elseif (($request->filled('all')) && ($request->input('all') == 'true')) {
$users = $users->withTrashed();
}
$total = $users->count(); $total = $users->count();
$users = $users->skip($offset)->take($limit)->get(); $users = $users->skip($offset)->take($limit)->get();

1
resources/lang/en/admin/hardware/general.php
View file

@ -45,4 +45,5 @@ return [
'alert_details' => 'Please see below for details.', 'alert_details' => 'Please see below for details.',
'custom_export' => 'Custom Export', 'custom_export' => 'Custom Export',
'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup', 'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
'user_department' => 'User Department',
]; ];

4
resources/views/hardware/view.blade.php
View file

@ -919,6 +919,10 @@
</li> </li>
@endif @endif
@if((isset($asset->assignedTo)) && ($asset->assignedTo->department))
<li>{{ trans('admin/hardware/general.user_department') }}: {{ $asset->assignedTo->department->name}}</li>
@endif
@if (isset($asset->location)) @if (isset($asset->location))
<li>{{ $asset->location->name }}</li> <li>{{ $asset->location->name }}</li>
<li>{{ $asset->location->address }} <li>{{ $asset->location->address }}