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

Merge pull request #11190 from inietov/fixes/requested_assets_models_workflow

Browse source 
Adjust requested assets and models workflow a little bit.
This commit is contained in:
snipe 2022-05-24 14:31:40 -07:00 committed by GitHub
parent 91822d2e45 a4cf601c98
commit a243823e5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Models/Asset.php
View file

@ -1187,7 +1187,9 @@ class Asset extends Depreciable
public function scopeRequestableAssets($query)
{
return Company::scopeCompanyables($query->where('requestable', '=', 1))
$table = $query->getModel()->getTable();
return Company::scopeCompanyables($query->where($table.'.requestable', '=', 1))
->whereHas('assetstatus', function ($query) {
$query->where(function ($query) {
$query->where('deployable', '=', 1)

8
resources/views/account/requestable-assets.blade.php
View file

@ -109,8 +109,14 @@
</td>
<td>
@can('view', \App\Models\AssetModel::class)
<a href='{{ url("/models/{$requestableModel->id}") }}'>{{ $requestableModel->name }}</a>
@else
{{ $requestableModel->name }}
@endcan
</td>
<td>{{$requestableModel->name}}</td>
<td>{{$requestableModel->assets->where('requestable', '1')->count()}}</td>
<td>

3
resources/views/hardware/requested.blade.php
View file

@ -51,8 +51,7 @@
<th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
<th class="col-md-3" data-sortable="true">{{ trans('admin/hardware/table.requesting_user') }}</th>
<th class="col-md-2">{{ trans('admin/hardware/table.requested_date') }}</th>
<th class="col-md-1"></th>
<th class="col-md-1"></th>
<th class="col-md-1">{{ trans('general.checkin').'/'.trans('general.checkout') }}</th>
</tr>
</thead>
<tbody>