kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

#2034

Browse Source
This commit is contained in:
James Cole
2019-02-02 07:00:09 +01:00
parent cf307a00e1
commit 96bb880d1b
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Json/AutoCompleteController.php
View File

@@ -205,7 +205,7 @@ class AutoCompleteController extends Controller
{
$search = (string)$request->get('search');
$cache = new CacheProperties;
$cache->addProperty('ac-revenue-accounts');
$cache->addProperty('ac-journals');
// very unlikely a user will actually search for this string.
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
$cache->addProperty($key);

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

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use Carbon\Carbon;
use FireflyIII\Events\UpdatedTransactionJournal;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Filter\InternalTransferFilter;
use FireflyIII\Helpers\Filter\TransactionViewFilter;
@@ -241,6 +242,9 @@ class MassController extends Controller
// call repository update function.
$repository->update($journal, $data);
// trigger rules
event(new UpdatedTransactionJournal($journal));
++$count;
}
}

28
public/v1/js/ff/transactions/mass/edit.js vendored
View File

@@ -23,8 +23,36 @@
$(document).ready(function () {
"use strict";
// description
if ($('input[name^="description["]').length > 0) {
console.log('descr');
var journalNames = new Bloodhound({
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: {
url: 'json/transaction-journals/all?uid=' + uid,
filter: function (list) {
return $.map(list, function (name) {
return {name: name};
});
}
},
remote: {
url: 'json/transaction-journals/all?search=%QUERY&uid=' + uid,
wildcard: '%QUERY',
filter: function (list) {
return $.map(list, function (name) {
return {name: name};
});
}
}
});
journalNames.initialize();
$('input[name^="description["]').typeahead({hint: true, highlight: true,}, {source: journalNames, displayKey: 'name', autoSelect: false});
}
// destination account names:
if ($('input[name^="destination_name["]').length > 0) {
var destNames = new Bloodhound({
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace,