From 4152179f108148dc97bc326cf2bb8df024699ac6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 28 Oct 2018 19:17:33 +0100 Subject: [PATCH] Fix #1830 --- app/Http/Controllers/JavascriptController.php | 6 +++++- public/js/ff/common/autocomplete.js | 16 +++++++-------- public/js/ff/rules/create-edit.js | 4 ++-- public/js/ff/transactions/mass/edit.js | 12 +++++------ public/js/ff/transactions/show.js | 4 ++-- public/js/ff/transactions/single/create.js | 4 ++-- public/js/ff/transactions/single/edit.js | 4 ++-- public/js/ff/transactions/split/edit.js | 20 +++++++++---------- resources/views/javascript/variables.twig | 2 +- 9 files changed, 38 insertions(+), 34 deletions(-) diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index d5527846a6..dd81fccb52 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -48,7 +48,9 @@ class JavascriptController extends Controller */ 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')); /** @noinspection NullPointerExceptionInspection */ $default = $currencyRepository->findByCodeNull($preference->data); @@ -124,6 +126,7 @@ class JavascriptController extends Controller /** @noinspection NullPointerExceptionInspection */ $lang = $pref->data; $dateRange = $this->getDateRangeConfig(); + $uid = substr(hash('sha256', auth()->user()->id . auth()->user()->email), 0, 12); $data = [ 'currencyCode' => $currency->code, @@ -133,6 +136,7 @@ class JavascriptController extends Controller 'language' => $lang, 'dateRangeTitle' => $dateRange['title'], 'dateRangeConfig' => $dateRange['configuration'], + 'uid' => $uid, ]; $request->session()->keep(['two-factor-secret']); diff --git a/public/js/ff/common/autocomplete.js b/public/js/ff/common/autocomplete.js index ccba2d5028..5d8b15a796 100644 --- a/public/js/ff/common/autocomplete.js +++ b/public/js/ff/common/autocomplete.js @@ -27,7 +27,7 @@ function initTagsAC() { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/tags', + url: 'json/tags?uid=' + uid, filter: function (list) { return $.map(list, function (tagTag) { return {name: tagTag}; @@ -35,7 +35,7 @@ function initTagsAC() { } }, remote: { - url: 'json/tags?search=%QUERY', + url: 'json/tags?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { @@ -74,7 +74,7 @@ function initExpenseACField(fieldName) { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/expense-accounts', + url: 'json/expense-accounts?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -82,7 +82,7 @@ function initExpenseACField(fieldName) { } }, remote: { - url: 'json/expense-accounts?search=%QUERY', + url: 'json/expense-accounts?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { @@ -113,7 +113,7 @@ function initRevenueACField(fieldName) { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/revenue-accounts', + url: 'json/revenue-accounts?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -121,7 +121,7 @@ function initRevenueACField(fieldName) { } }, remote: { - url: 'json/revenue-accounts?search=%QUERY', + url: 'json/revenue-accounts?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { @@ -143,7 +143,7 @@ function initCategoryAC() { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/categories', + url: 'json/categories?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -151,7 +151,7 @@ function initCategoryAC() { } }, remote: { - url: 'json/categories?search=%QUERY', + url: 'json/categories?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { diff --git a/public/js/ff/rules/create-edit.js b/public/js/ff/rules/create-edit.js index 79d6a9b291..420a04aace 100644 --- a/public/js/ff/rules/create-edit.js +++ b/public/js/ff/rules/create-edit.js @@ -367,7 +367,7 @@ function createAutoComplete(input, URI) { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: URI, + url: URI + '?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -375,7 +375,7 @@ function createAutoComplete(input, URI) { } }, remote: { - url: URI + '?search=%QUERY', + url: URI + '?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { diff --git a/public/js/ff/transactions/mass/edit.js b/public/js/ff/transactions/mass/edit.js index e1fa6d17af..9fa02fa9b7 100644 --- a/public/js/ff/transactions/mass/edit.js +++ b/public/js/ff/transactions/mass/edit.js @@ -29,7 +29,7 @@ $(document).ready(function () { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/expense-accounts', + url: 'json/expense-accounts?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -37,7 +37,7 @@ $(document).ready(function () { } }, remote: { - url: 'json/expense-accounts?search=%QUERY', + url: 'json/expense-accounts?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { @@ -57,7 +57,7 @@ $(document).ready(function () { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/revenue-accounts', + url: 'json/revenue-accounts?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -65,7 +65,7 @@ $(document).ready(function () { } }, remote: { - url: 'json/revenue-accounts?search=%QUERY', + url: 'json/revenue-accounts?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { @@ -83,7 +83,7 @@ $(document).ready(function () { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/categories', + url: 'json/categories?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -91,7 +91,7 @@ $(document).ready(function () { } }, remote: { - url: 'json/categories?search=%QUERY', + url: 'json/categories?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { diff --git a/public/js/ff/transactions/show.js b/public/js/ff/transactions/show.js index d3dad51d6b..85951f650e 100644 --- a/public/js/ff/transactions/show.js +++ b/public/js/ff/transactions/show.js @@ -29,7 +29,7 @@ $(function () { return obj.id; }, prefetch: { - url: autoCompleteUri + url: autoCompleteUri + '?uid=' + uid, // filter: function (list) { // return $.map(list, function (name) { // return {name: name.name}; @@ -37,7 +37,7 @@ $(function () { // } }, remote: { - url: autoCompleteUri + '?search=%QUERY', + url: autoCompleteUri + '?search=%QUERY&uid=' + uid, wildcard: '%QUERY' // filter: function (list) { // return $.map(list, function (name) { diff --git a/public/js/ff/transactions/single/create.js b/public/js/ff/transactions/single/create.js index 9411d1ab2c..3edaeda691 100644 --- a/public/js/ff/transactions/single/create.js +++ b/public/js/ff/transactions/single/create.js @@ -142,7 +142,7 @@ function updateDescription() { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/transaction-journals/' + what, + url: 'json/transaction-journals/' + what + '?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -150,7 +150,7 @@ function updateDescription() { } }, remote: { - url: 'json/transaction-journals/' + what + '?search=%QUERY', + url: 'json/transaction-journals/' + what + '?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { diff --git a/public/js/ff/transactions/single/edit.js b/public/js/ff/transactions/single/edit.js index a7783893f7..df004dc6f0 100644 --- a/public/js/ff/transactions/single/edit.js +++ b/public/js/ff/transactions/single/edit.js @@ -202,7 +202,7 @@ function setAutocompletes() { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/transaction-journals/' + what, + url: 'json/transaction-journals/' + what + '?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -210,7 +210,7 @@ function setAutocompletes() { } }, remote: { - url: 'json/transaction-journals/' + what + '?search=%QUERY', + url: 'json/transaction-journals/' + what + '?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { diff --git a/public/js/ff/transactions/split/edit.js b/public/js/ff/transactions/split/edit.js index 161040c509..b2cfcdae9e 100644 --- a/public/js/ff/transactions/split/edit.js +++ b/public/js/ff/transactions/split/edit.js @@ -36,7 +36,7 @@ $(document).ready(function () { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/expense-accounts', + url: 'json/expense-accounts?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -44,7 +44,7 @@ $(document).ready(function () { } }, remote: { - url: 'json/expense-accounts?search=%QUERY', + url: 'json/expense-accounts?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { @@ -61,7 +61,7 @@ $(document).ready(function () { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/revenue-accounts', + url: 'json/revenue-accounts?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -69,7 +69,7 @@ $(document).ready(function () { } }, remote: { - url: 'json/revenue-accounts?search=%QUERY', + url: 'json/revenue-accounts?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { @@ -86,7 +86,7 @@ $(document).ready(function () { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/categories', + url: 'json/categories?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -94,7 +94,7 @@ $(document).ready(function () { } }, remote: { - url: 'json/categories?search=%QUERY', + url: 'json/categories?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { @@ -111,7 +111,7 @@ $(document).ready(function () { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/transaction-journals/' + what, + url: 'json/transaction-journals/' + what + '?uid=' + uid, filter: function (list) { return $.map(list, function (name) { return {name: name}; @@ -119,7 +119,7 @@ $(document).ready(function () { } }, remote: { - url: 'json/transaction-journals/' + what + '?search=%QUERY', + url: 'json/transaction-journals/' + what + '?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { @@ -139,7 +139,7 @@ $(document).ready(function () { datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), queryTokenizer: Bloodhound.tokenizers.whitespace, prefetch: { - url: 'json/tags', + url: 'json/tags?uid=' + uid, filter: function (list) { return $.map(list, function (tagTag) { return {name: tagTag}; @@ -147,7 +147,7 @@ $(document).ready(function () { } }, remote: { - url: 'json/tags?search=%QUERY', + url: 'json/tags?search=%QUERY&uid=' + uid, wildcard: '%QUERY', filter: function (list) { return $.map(list, function (name) { diff --git a/resources/views/javascript/variables.twig b/resources/views/javascript/variables.twig index 545ff71394..3ee7aa17a5 100644 --- a/resources/views/javascript/variables.twig +++ b/resources/views/javascript/variables.twig @@ -25,7 +25,7 @@ ranges: ranges }; - +var uid = "{{ uid }}"; var language = "{{ language|escape }}"; var currencyCode = '{{ currencyCode|escape('js') }}'; var currencySymbol = '{{ currencySymbol|escape('js') }}';