IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-29 02:11:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

New code by @vissert that allows category edit (see #282)

Browse Source 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
This commit is contained in:
James Cole 2016-09-03 05:01:48 +02:00
parent 29af4bd1b9
commit 8c7ef49eb6
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,7 @@ class MassController extends Controller
$destAccountName = $request->get('destination_account_name')[$journal->id] ?? '';
$budgetId = $journal->budgets->first() ? $journal->budgets->first()->id : 0;
$category = $journal->categories->first() ? $journal->categories->first()->name : '';
$category = $request->get('category')[$journal->id];
$tags = $journal->tags->pluck('tag')->toArray();
// build data array

8
public/js/ff/transactions/create-edit.js
View File

@ -81,9 +81,13 @@ $(document).ready(function () {
}
// also for multi input:
if ($('input[name="category[]"]').length > 0) {
if ($('input[name^="category["]').length > 0) {
$.getJSON('json/categories').done(function (data) {
$('input[name="category[]"]').typeahead({source: data});
$('input[name^="category["]').typeahead({source: data});
});
}
});

19
resources/views/transactions/mass-edit.twig
View File

@ -20,12 +20,14 @@
</p>
<table class="table table-striped table-condensed">
<tr>
<th style="width: 5%;">&nbsp;</th>
<th style="width: 20%;">{{ trans('list.description') }}</th>
<th style="width: 15%;">{{ trans('list.amount') }}</th>
<th style="width: 20%;">{{ trans('list.date') }}</th>
<th style="width: 20%;">{{ trans('list.from') }}</th>
<th style="width: 20%;">{{ trans('list.to') }}</th>
<tr>
<th class="">&nbsp;</th>
<th class="col-lg-4 col-md-4 col-sm-4">{{ trans('list.description') }}</th>
<th class="col-lg-1 col-md-1 col-sm-1">{{ trans('list.amount') }}</th>
<th class="col-lg-1 col-md-1 col-sm-1">{{ trans('list.date') }}</th>
<th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.from') }}</th>
<th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.to') }}</th>
<th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.category') }}</th>
</tr>
{% for journal in journals %}
{% if journal.transaction_count == 2 %}
@ -76,7 +78,10 @@
{{ Form.input('text', 'destination_account_name['~journal.id~']', journal.destination_account_name, {'class': 'form-control', 'placeholder': trans('form.expense_account')}) }}
{% endif %}
</td>
<!-- category -->
<td>
{{ Form.input('text', 'category['~journal.id~']', journal.categories[0].name, {'class': 'form-control', 'placeholder': trans('form.category')}) }}
</td>
</tr>
{% endif %}