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

Fix for searching on child location names (#7646)

Browse source 
* Fix for child locations

* Reverts temp changes to indenter
This commit is contained in:
snipe 2019-12-06 13:14:10 -08:00 committed by GitHub
parent 893454dca7
commit ff57f10e9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Http/Controllers/Api/LocationsController.php
View file

@ -232,23 +232,28 @@ class LocationsController extends Controller
} }
if ($request->filled('search')) { if ($request->filled('search')) {
\Log::debug('Searching... ');
$locations = $locations->where('locations.name', 'LIKE', '%'.$request->input('search').'%'); $locations = $locations->where('locations.name', 'LIKE', '%'.$request->input('search').'%');
} }
$locations = $locations->orderBy('name', 'ASC')->get(); $locations = $locations->orderBy('name', 'ASC')->get();
$locations_with_children = []; $locations_with_children = [];
foreach ($locations as $location) { foreach ($locations as $location) {
if(!array_key_exists($location->parent_id, $locations_with_children)) { if (!array_key_exists($location->parent_id, $locations_with_children)) {
$locations_with_children[$location->parent_id] = []; $locations_with_children[$location->parent_id] = [];
} }
$locations_with_children[$location->parent_id][] = $location; $locations_with_children[$location->parent_id][] = $location;
} }
$location_options = Location::indenter($locations_with_children); if ($request->filled('search')) {
$locations_formatted = $locations;
} else {
$location_options = Location::indenter($locations_with_children);
$locations_formatted = new Collection($location_options);
}
$locations_formatted = new Collection($location_options);
$paginated_results = new LengthAwarePaginator($locations_formatted->forPage($page, 500), $locations_formatted->count(), 500, $page, []); $paginated_results = new LengthAwarePaginator($locations_formatted->forPage($page, 500), $locations_formatted->count(), 500, $page, []);
//return []; //return [];

2
app/Models/Location.php
View file

@ -150,11 +150,13 @@ class Location extends SnipeModel
public static function indenter($locations_with_children, $parent_id = null, $prefix = '') { public static function indenter($locations_with_children, $parent_id = null, $prefix = '') {
$results = Array(); $results = Array();
if (!array_key_exists($parent_id, $locations_with_children)) { if (!array_key_exists($parent_id, $locations_with_children)) {
return []; return [];
} }
foreach ($locations_with_children[$parent_id] as $location) { foreach ($locations_with_children[$parent_id] as $location) {
$location->use_text = $prefix.' '.$location->name; $location->use_text = $prefix.' '.$location->name;
$location->use_image = ($location->image) ? url('/').'/uploads/locations/'.$location->image : null; $location->use_image = ($location->image) ? url('/').'/uploads/locations/'.$location->image : null;