lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #15217 from TelecomsSansFrontieres/feature_extend-search-by-tag

Browse source 
Feature: Extend search capabilities to other assets attributes
This commit is contained in:
snipe 2024-08-05 15:38:51 +01:00 • committed by GitHub
commit b83d148b37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/Assets/AssetsController.php
View file

@ -478,9 +478,16 @@ class AssetsController extends Controller
$tag = $tag ? $tag : $request->get('assetTag'); $tag = $tag ? $tag : $request->get('assetTag');
$topsearch = ($request->get('topsearch') == 'true'); $topsearch = ($request->get('topsearch') == 'true');
if (! $asset = Asset::where('asset_tag', '=', $tag)->first()) { // Search for an exact and unique asset tag match
return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); $assets = Asset::where('asset_tag', '=', $tag);
// If not a unique result, redirect to the index view
if ($assets->count() != 1) {
return redirect()->route('hardware.index')
->with('search', $tag)
->with('warning', trans('admin/hardware/message.does_not_exist_var', [ 'asset_tag' => $tag ]));
} }
$asset = $assets->first();
$this->authorize('view', $asset); $this->authorize('view', $asset);
return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch); return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);

1
resources/views/hardware/index.blade.php
View file

@ -73,6 +73,7 @@
data-pagination="true" data-pagination="true"
data-id-table="assetsListingTable" data-id-table="assetsListingTable"
data-search="true" data-search="true"
data-search-text="{{ e(Session::get('search')) }}"
data-side-pagination="server" data-side-pagination="server"
data-show-columns="true" data-show-columns="true"
data-show-export="true" data-show-export="true"