mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-24 22:48:18 +00:00
This commit is contained in:
@@ -62,7 +62,6 @@ class AccountController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function search(Request $request): JsonResponse|Response
|
public function search(Request $request): JsonResponse|Response
|
||||||
{
|
{
|
||||||
app('log')->debug('Now in account search()');
|
|
||||||
$manager = $this->getManager();
|
$manager = $this->getManager();
|
||||||
$query = trim((string)$request->get('query'));
|
$query = trim((string)$request->get('query'));
|
||||||
$field = trim((string)$request->get('field'));
|
$field = trim((string)$request->get('field'));
|
||||||
@@ -70,6 +69,7 @@ class AccountController extends Controller
|
|||||||
if ('' === $query || !in_array($field, $this->validFields, true)) {
|
if ('' === $query || !in_array($field, $this->validFields, true)) {
|
||||||
return response(null, 422);
|
return response(null, 422);
|
||||||
}
|
}
|
||||||
|
app('log')->debug(sprintf('Now in account search("%s", "%s")', $field, $query));
|
||||||
$types = $this->mapAccountTypes($type);
|
$types = $this->mapAccountTypes($type);
|
||||||
|
|
||||||
/** @var AccountSearch $search */
|
/** @var AccountSearch $search */
|
||||||
|
@@ -284,19 +284,13 @@ Route::group(
|
|||||||
Route::get('show/{budget}', ['uses' => 'Budget\ShowController@show', 'as' => 'show']);
|
Route::get('show/{budget}', ['uses' => 'Budget\ShowController@show', 'as' => 'show']);
|
||||||
Route::get('show/{budget}/{budgetLimit}', ['uses' => 'Budget\ShowController@showByBudgetLimit', 'as' => 'show.limit']);
|
Route::get('show/{budget}/{budgetLimit}', ['uses' => 'Budget\ShowController@showByBudgetLimit', 'as' => 'show.limit']);
|
||||||
Route::get('list/no-budget/all', ['uses' => 'Budget\ShowController@noBudgetAll', 'as' => 'no-budget-all']);
|
Route::get('list/no-budget/all', ['uses' => 'Budget\ShowController@noBudgetAll', 'as' => 'no-budget-all']);
|
||||||
Route::get('list/no-budget/{start_date?}/{end_date?}', ['uses' => 'Budget\ShowController@noBudget', 'as' => 'no-budget'])
|
Route::get('list/no-budget/{start_date?}/{end_date?}', ['uses' => 'Budget\ShowController@noBudget', 'as' => 'no-budget']);
|
||||||
->where(['start_date' => DATEFORMAT])
|
|
||||||
->where(['end_date' => DATEFORMAT])
|
|
||||||
;
|
|
||||||
|
|
||||||
// reorder budgets
|
// reorder budgets
|
||||||
Route::post('reorder', ['uses' => 'Budget\IndexController@reorder', 'as' => 'reorder']);
|
Route::post('reorder', ['uses' => 'Budget\IndexController@reorder', 'as' => 'reorder']);
|
||||||
|
|
||||||
// index
|
// index
|
||||||
Route::get('{start_date?}/{end_date?}', ['uses' => 'Budget\IndexController@index', 'as' => 'index'])
|
Route::get('{start_date?}/{end_date?}', ['uses' => 'Budget\IndexController@index', 'as' => 'index']);
|
||||||
->where(['start_date' => DATEFORMAT])
|
|
||||||
->where(['end_date' => DATEFORMAT])
|
|
||||||
;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user