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

Fix #1830

Browse Source
This commit is contained in:
James Cole 2018-10-28 19:17:33 +01:00
parent 400219a9fc
commit 4152179f10
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
9 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/JavascriptController.php
View File

@ -48,7 +48,9 @@ class JavascriptController extends Controller
*/ */
public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
{ {
$accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::DEBT,AccountType::LOAN,AccountType::MORTGAGE, AccountType::CREDITCARD]); $accounts = $repository->getAccountsByType(
[AccountType::DEFAULT, AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD]
);
$preference = app('preferences')->get('currencyPreference', config('firefly.default_currency', 'EUR')); $preference = app('preferences')->get('currencyPreference', config('firefly.default_currency', 'EUR'));
/** @noinspection NullPointerExceptionInspection */ /** @noinspection NullPointerExceptionInspection */
$default = $currencyRepository->findByCodeNull($preference->data); $default = $currencyRepository->findByCodeNull($preference->data);
@ -124,6 +126,7 @@ class JavascriptController extends Controller
/** @noinspection NullPointerExceptionInspection */ /** @noinspection NullPointerExceptionInspection */
$lang = $pref->data; $lang = $pref->data;
$dateRange = $this->getDateRangeConfig(); $dateRange = $this->getDateRangeConfig();
$uid = substr(hash('sha256', auth()->user()->id . auth()->user()->email), 0, 12);
$data = [ $data = [
'currencyCode' => $currency->code, 'currencyCode' => $currency->code,
@ -133,6 +136,7 @@ class JavascriptController extends Controller
'language' => $lang, 'language' => $lang,
'dateRangeTitle' => $dateRange['title'], 'dateRangeTitle' => $dateRange['title'],
'dateRangeConfig' => $dateRange['configuration'], 'dateRangeConfig' => $dateRange['configuration'],
'uid' => $uid,
]; ];
$request->session()->keep(['two-factor-secret']); $request->session()->keep(['two-factor-secret']);

16
public/js/ff/common/autocomplete.js vendored
View File

@ -27,7 +27,7 @@ function initTagsAC() {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/tags', url: 'json/tags?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (tagTag) { return $.map(list, function (tagTag) {
return {name: tagTag}; return {name: tagTag};
@ -35,7 +35,7 @@ function initTagsAC() {
} }
}, },
remote: { remote: {
url: 'json/tags?search=%QUERY', url: 'json/tags?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
@ -74,7 +74,7 @@ function initExpenseACField(fieldName) {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/expense-accounts', url: 'json/expense-accounts?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -82,7 +82,7 @@ function initExpenseACField(fieldName) {
} }
}, },
remote: { remote: {
url: 'json/expense-accounts?search=%QUERY', url: 'json/expense-accounts?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
@ -113,7 +113,7 @@ function initRevenueACField(fieldName) {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/revenue-accounts', url: 'json/revenue-accounts?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -121,7 +121,7 @@ function initRevenueACField(fieldName) {
} }
}, },
remote: { remote: {
url: 'json/revenue-accounts?search=%QUERY', url: 'json/revenue-accounts?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
@ -143,7 +143,7 @@ function initCategoryAC() {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/categories', url: 'json/categories?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -151,7 +151,7 @@ function initCategoryAC() {
} }
}, },
remote: { remote: {
url: 'json/categories?search=%QUERY', url: 'json/categories?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {

4
public/js/ff/rules/create-edit.js vendored
View File

@ -367,7 +367,7 @@ function createAutoComplete(input, URI) {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: URI, url: URI + '?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -375,7 +375,7 @@ function createAutoComplete(input, URI) {
} }
}, },
remote: { remote: {
url: URI + '?search=%QUERY', url: URI + '?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {

12
public/js/ff/transactions/mass/edit.js vendored
View File

@ -29,7 +29,7 @@ $(document).ready(function () {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/expense-accounts', url: 'json/expense-accounts?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -37,7 +37,7 @@ $(document).ready(function () {
} }
}, },
remote: { remote: {
url: 'json/expense-accounts?search=%QUERY', url: 'json/expense-accounts?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
@ -57,7 +57,7 @@ $(document).ready(function () {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/revenue-accounts', url: 'json/revenue-accounts?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -65,7 +65,7 @@ $(document).ready(function () {
} }
}, },
remote: { remote: {
url: 'json/revenue-accounts?search=%QUERY', url: 'json/revenue-accounts?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
@ -83,7 +83,7 @@ $(document).ready(function () {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/categories', url: 'json/categories?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -91,7 +91,7 @@ $(document).ready(function () {
} }
}, },
remote: { remote: {
url: 'json/categories?search=%QUERY', url: 'json/categories?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {

4
public/js/ff/transactions/show.js vendored
View File

@ -29,7 +29,7 @@ $(function () {
return obj.id; return obj.id;
}, },
prefetch: { prefetch: {
url: autoCompleteUri url: autoCompleteUri + '?uid=' + uid,
// filter: function (list) { // filter: function (list) {
// return $.map(list, function (name) { // return $.map(list, function (name) {
// return {name: name.name}; // return {name: name.name};
@ -37,7 +37,7 @@ $(function () {
// } // }
}, },
remote: { remote: {
url: autoCompleteUri + '?search=%QUERY', url: autoCompleteUri + '?search=%QUERY&uid=' + uid,
wildcard: '%QUERY' wildcard: '%QUERY'
// filter: function (list) { // filter: function (list) {
// return $.map(list, function (name) { // return $.map(list, function (name) {

4
public/js/ff/transactions/single/create.js vendored
View File

@ -142,7 +142,7 @@ function updateDescription() {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/transaction-journals/' + what, url: 'json/transaction-journals/' + what + '?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -150,7 +150,7 @@ function updateDescription() {
} }
}, },
remote: { remote: {
url: 'json/transaction-journals/' + what + '?search=%QUERY', url: 'json/transaction-journals/' + what + '?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {

4
public/js/ff/transactions/single/edit.js vendored
View File

@ -202,7 +202,7 @@ function setAutocompletes() {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/transaction-journals/' + what, url: 'json/transaction-journals/' + what + '?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -210,7 +210,7 @@ function setAutocompletes() {
} }
}, },
remote: { remote: {
url: 'json/transaction-journals/' + what + '?search=%QUERY', url: 'json/transaction-journals/' + what + '?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {

20
public/js/ff/transactions/split/edit.js vendored
View File

@ -36,7 +36,7 @@ $(document).ready(function () {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/expense-accounts', url: 'json/expense-accounts?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -44,7 +44,7 @@ $(document).ready(function () {
} }
}, },
remote: { remote: {
url: 'json/expense-accounts?search=%QUERY', url: 'json/expense-accounts?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
@ -61,7 +61,7 @@ $(document).ready(function () {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/revenue-accounts', url: 'json/revenue-accounts?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -69,7 +69,7 @@ $(document).ready(function () {
} }
}, },
remote: { remote: {
url: 'json/revenue-accounts?search=%QUERY', url: 'json/revenue-accounts?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
@ -86,7 +86,7 @@ $(document).ready(function () {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/categories', url: 'json/categories?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -94,7 +94,7 @@ $(document).ready(function () {
} }
}, },
remote: { remote: {
url: 'json/categories?search=%QUERY', url: 'json/categories?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
@ -111,7 +111,7 @@ $(document).ready(function () {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/transaction-journals/' + what, url: 'json/transaction-journals/' + what + '?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
return {name: name}; return {name: name};
@ -119,7 +119,7 @@ $(document).ready(function () {
} }
}, },
remote: { remote: {
url: 'json/transaction-journals/' + what + '?search=%QUERY', url: 'json/transaction-journals/' + what + '?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {
@ -139,7 +139,7 @@ $(document).ready(function () {
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: { prefetch: {
url: 'json/tags', url: 'json/tags?uid=' + uid,
filter: function (list) { filter: function (list) {
return $.map(list, function (tagTag) { return $.map(list, function (tagTag) {
return {name: tagTag}; return {name: tagTag};
@ -147,7 +147,7 @@ $(document).ready(function () {
} }
}, },
remote: { remote: {
url: 'json/tags?search=%QUERY', url: 'json/tags?search=%QUERY&uid=' + uid,
wildcard: '%QUERY', wildcard: '%QUERY',
filter: function (list) { filter: function (list) {
return $.map(list, function (name) { return $.map(list, function (name) {

2
resources/views/javascript/variables.twig
View File

@ -25,7 +25,7 @@ ranges: ranges
}; };
var uid = "{{ uid }}";
var language = "{{ language|escape }}"; var language = "{{ language|escape }}";
var currencyCode = '{{ currencyCode|escape('js') }}'; var currencyCode = '{{ currencyCode|escape('js') }}';
var currencySymbol = '{{ currencySymbol|escape('js') }}'; var currencySymbol = '{{ currencySymbol|escape('js') }}';