gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 12:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tests, fixes some bugs.

Browse Source
This commit is contained in:
James Cole
2016-12-11 10:38:06 +01:00
parent ec3b356f86
commit b4eac84097
8 changed files with 169 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Transaction/MassController.php
View File

@@ -58,7 +58,7 @@ class MassController extends Controller
*
* @return View
*/
public function massDelete(Collection $journals)
public function delete(Collection $journals)
{
$subTitle = trans('firefly.mass_delete_journals');
@@ -77,7 +77,7 @@ class MassController extends Controller
*
* @return mixed
*/
public function massDestroy(MassDeleteJournalRequest $request, JournalRepositoryInterface $repository)
public function destroy(MassDeleteJournalRequest $request, JournalRepositoryInterface $repository)
{
$ids = $request->get('confirm_mass_delete');
$set = new Collection;
@@ -114,7 +114,7 @@ class MassController extends Controller
*
* @return View
*/
public function massEdit(Collection $journals)
public function edit(Collection $journals)
{
$subTitle = trans('firefly.mass_edit_journals');
@@ -187,7 +187,7 @@ class MassController extends Controller
*
* @return mixed
*/
public function massUpdate(MassEditJournalRequest $request, JournalRepositoryInterface $repository)
public function update(MassEditJournalRequest $request, JournalRepositoryInterface $repository)
{
$journalIds = $request->get('journals');
$count = 0;

24
app/Http/breadcrumbs.php
View File

@@ -27,6 +27,7 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\User;
use Illuminate\Support\Collection;
/**
* HOME
@@ -652,6 +653,29 @@ Breadcrumbs::register(
}
);
/**
* MASS TRANSACTION EDIT / DELETE
*/
Breadcrumbs::register(
'transactions.mass.edit', function (BreadCrumbGenerator $breadcrumbs, Collection $journals) {
$journalIds = $journals->pluck('id')->toArray();
$what = strtolower($journals->first()->transactionType->type);
$breadcrumbs->parent('transactions.index', $what);
$breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', $journalIds));
}
);
Breadcrumbs::register(
'transactions.mass.delete', function (BreadCrumbGenerator $breadcrumbs, Collection $journals) {
$journalIds = $journals->pluck('id')->toArray();
$what = strtolower($journals->first()->transactionType->type);
$breadcrumbs->parent('transactions.index', $what);
$breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.delete', $journalIds));
}
);
/**
* SPLIT