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

Correctly filter by category_id

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-06-13 20:42:21 -07:00
parent aec033d8d2
commit dd9c9520fb
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Api/AssetModelsController.php
View file

@ -70,6 +70,10 @@ class AssetModelsController extends Controller
$assetmodels->onlyTrashed(); $assetmodels->onlyTrashed();
} }
if ($request->filled('category_id')) {
$assetmodels = $assetmodels->where('models.category_id', '=', $request->input('category_id'));
}
if ($request->filled('search')) { if ($request->filled('search')) {
$assetmodels->TextSearch($request->input('search')); $assetmodels->TextSearch($request->input('search'));
} }

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

@ -129,11 +129,13 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@can('update', \App\Models\AssetModel::class)
@if ($category->models->count() > 0) @if ($category->models->count() > 0)
@if ($category->category_type=='asset') @if ($category->category_type=='asset')
@include('partials.models-bulk-actions') @include('partials.models-bulk-actions')
@endif @endif
@endif @endif
@endcan
<table <table
data-columns="{{ \App\Presenters\AssetModelPresenter::dataTableLayout() }}" data-columns="{{ \App\Presenters\AssetModelPresenter::dataTableLayout() }}"
@ -152,7 +154,7 @@
data-sort-order="asc" data-sort-order="asc"
id="asssetModelsTable" id="asssetModelsTable"
class="table table-striped snipe-table" class="table table-striped snipe-table"
data-url="{{ route('api.models.index', ['status' => request('status')]) }}" data-url="{{ route('api.models.index', ['status' => request('status'), 'category_id' => $category->id]) }}"
data-export-options='{ data-export-options='{
"fileName": "export-models-{{ date('Y-m-d') }}", "fileName": "export-models-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]