mirror of https://github.com/kcal-app/kcal.git
Sort combines ingredient picker results
This commit is contained in:
parent
0bc6c3582f
commit
a7d89290b8
|
|
@ -4,6 +4,7 @@ namespace App\Http\Controllers;
|
|||
|
||||
use App\Models\Food;
|
||||
use App\Models\Recipe;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
|
|
@ -14,12 +15,12 @@ class IngredientPickerController extends Controller
|
|||
*/
|
||||
public function search(Request $request): JsonResponse
|
||||
{
|
||||
$results = [];
|
||||
$results = new Collection();
|
||||
$term = $request->query->get('term');
|
||||
if (!empty($term)) {
|
||||
$results = Food::search($term)->get();
|
||||
$results = $results->merge(Food::search($term)->get());
|
||||
$results = $results->merge(Recipe::search($term)->get());
|
||||
}
|
||||
return response()->json($results);
|
||||
return response()->json($results->sortBy('name')->values());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue