IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some improvements, also edit screen.

Browse Source
This commit is contained in:
James Cole
2019-06-01 20:38:18 +02:00
parent 0a6e20eae4
commit 2a2f29533d
14 changed files with 2916 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
routes/breadcrumbs.php
View File

@@ -1030,10 +1030,14 @@ try {
Breadcrumbs::register(
'transactions.edit',
function (BreadcrumbsGenerator $breadcrumbs, TransactionJournal $journal) {
$breadcrumbs->parent('transactions.show', $journal);
function (BreadcrumbsGenerator $breadcrumbs, TransactionGroup $group) {
$breadcrumbs->parent('transactions.show', $group);
/** @var TransactionJournal $first */
$first = $group->transactionJournals()->first();
$breadcrumbs->push(
trans('breadcrumbs.edit_journal', ['description' => limitStringLength($journal->description)]), route('transactions.edit', [$journal->id])
trans('breadcrumbs.edit_journal', ['description' => limitStringLength($first->description)]), route('transactions.edit', [$group->id])
);
}
);

22
routes/web.php
View File

@@ -554,7 +554,6 @@ Route::group(
Route::get('tags', ['uses' => 'Json\AutoCompleteController@tags', 'as' => 'autocomplete.tags']);
// TODO improve 3 routes:
//Route::get('transaction-journals/all', ['uses' => 'Json\AutoCompleteController@allTransactionJournals', 'as' => 'all-transaction-journals']);
//Route::get('transaction-journals/with-id/{tj}', ['uses' => 'Json\AutoCompleteController@journalsWithId', 'as' => 'journals-with-id']);
@@ -891,7 +890,16 @@ Route::group(
Route::get('create', ['uses' => 'Transaction\CreateController@create', 'as' => 'create']);
Route::post('store', ['uses' => 'Transaction\CreateController@store', 'as' => 'store']);
// edit group
Route::get('edit/{transactionGroup}', ['uses' => 'Transaction\EditController@edit', 'as' => 'edit']);
Route::post('update', ['uses' => 'Transaction\EditController@update', 'as' => 'update']);
// delete group
Route::get('delete/{transactionGroup}', ['uses' => 'Transaction\DeleteController@delete', 'as' => 'delete']);
Route::post('destroy/{transactionGroup}', ['uses' => 'Transaction\DeleteController@destroy', 'as' => 'destroy']);
// clone group:
Route::get('clone/{transactionGroup}', ['uses' => 'Transaction\CloneController@clone', 'as' => 'clone']);
Route::get('debug/{tj}', ['uses' => 'Transaction\SingleController@debugShow', 'as' => 'debug']);
Route::get('debug/{tj}', ['uses' => 'Transaction\SingleController@debugShow', 'as' => 'debug']);
@@ -913,13 +921,13 @@ Route::group(
function () {
// TODO improve these routes
Route::get('edit/{tj}', ['uses' => 'SingleController@edit', 'as' => 'edit']);
Route::get('delete/{tj}', ['uses' => 'SingleController@delete', 'as' => 'delete']);
//Route::get('edit/{tj}', ['uses' => 'SingleController@edit', 'as' => 'edit']);
//
//Route::post('store', ['uses' => 'SingleController@store', 'as' => 'store'])->where(['what' => 'withdrawal|deposit|transfer']);
Route::post('update/{tj}', ['uses' => 'SingleController@update', 'as' => 'update']);
Route::post('destroy/{tj}', ['uses' => 'SingleController@destroy', 'as' => 'destroy']);
Route::get('clone/{tj}', ['uses' => 'SingleController@cloneTransaction', 'as' => 'clone']);
Route::get('{tj}/{type}', ['uses' => 'ConvertController@index', 'as' => 'convert']);
//Route::post('update/{tj}', ['uses' => 'SingleController@update', 'as' => 'update']);
//
//Route::get('clone/{tj}', ['uses' => 'SingleController@cloneTransaction', 'as' => 'clone']);
//Route::get('{tj}/{type}', ['uses' => 'ConvertController@index', 'as' => 'convert']);
// TODO end of improvement.
}
);