From 381598f1bb39957380f9e5858f498a801e72d0be Mon Sep 17 00:00:00 2001 From: Sander Dorigo Date: Mon, 12 May 2025 08:39:21 +0200 Subject: [PATCH] Fix optional web routes --- resources/views/javascript/variables.twig | 6 +++--- routes/web.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/javascript/variables.twig b/resources/views/javascript/variables.twig index 8cc69e7538..37c6ab8c13 100644 --- a/resources/views/javascript/variables.twig +++ b/resources/views/javascript/variables.twig @@ -55,9 +55,9 @@ var edit_selected_txt = "{{ trans('firefly.mass_edit')|escape('js') }}"; var edit_bulk_selected_txt = "{{ trans('firefly.bulk_edit')|escape('js') }}"; var delete_selected_txt = "{{ trans('firefly.mass_delete')|escape('js') }}"; -var mass_edit_url = '{{ route('transactions.mass.edit', ['0']) }}'; -var bulk_edit_url = '{{ route('transactions.bulk.edit', ['0']) }}'; -var mass_delete_url = '{{ route('transactions.mass.delete', ['0']) }}'; +var mass_edit_url = '{{ route('transactions.mass.edit', ['']) }}'; +var bulk_edit_url = '{{ route('transactions.bulk.edit', ['']) }}'; +var mass_delete_url = '{{ route('transactions.mass.delete', ['']) }}'; // for demo: var nextLabel = "{{ trans('firefly.intro_next_label')|escape('js') }}"; diff --git a/routes/web.php b/routes/web.php index 6153823413..ee6039a7ae 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1303,8 +1303,8 @@ Route::group( Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/mass', 'as' => 'transactions.mass.'], static function (): void { - Route::get('edit/{journalList}', ['uses' => 'MassController@edit', 'as' => 'edit']); - Route::get('delete/{journalList}', ['uses' => 'MassController@delete', 'as' => 'delete']); + Route::get('edit/{journalList?}', ['uses' => 'MassController@edit', 'as' => 'edit']); + Route::get('delete/{journalList?}', ['uses' => 'MassController@delete', 'as' => 'delete']); Route::post('update', ['uses' => 'MassController@update', 'as' => 'update']); Route::post('destroy', ['uses' => 'MassController@destroy', 'as' => 'destroy']); } @@ -1314,7 +1314,7 @@ Route::group( Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/bulk', 'as' => 'transactions.bulk.'], static function (): void { - Route::get('edit/{journalList}', ['uses' => 'BulkController@edit', 'as' => 'edit']); + Route::get('edit/{journalList?}', ['uses' => 'BulkController@edit', 'as' => 'edit']); Route::post('update', ['uses' => 'BulkController@update', 'as' => 'update']); } );