kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-11 07:10:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix autocomplete.

Browse Source
This commit is contained in:
James Cole
2025-09-21 08:13:13 +02:00
parent 8a06298385
commit 69cae3ae55
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resources/assets/v2/src/pages/transactions/edit.js
View File

@@ -72,8 +72,6 @@ let transactions = function () {
resetButton: true,
rulesButton: true,
webhooksButton: true,
},
// form behaviour during transaction
@@ -85,7 +83,7 @@ let transactions = function () {
// form data (except transactions) is stored in formData
formData: {
defaultCurrency: null,
primaryCurrency: null,
enabledCurrencies: [],
primaryCurrencies: [],
foreignCurrencies: [],
@@ -200,8 +198,7 @@ let transactions = function () {
// addedSplit, is called from the HTML
// for source account
const renderAccount = function (item, b, c) {
console.log(item);
return item.title + '<br><small class="text-muted">' + i18next.t('firefly.account_type_' + item.meta.type) + '</small>';
return item.name_with_balance + '<br><small class="text-muted">' + i18next.t('firefly.account_type_' + item.type) + '</small>';
};
addAutocomplete({
selector: 'input.ac-source',
@@ -209,7 +206,7 @@ let transactions = function () {
account_types: this.filters.source,
onRenderItem: renderAccount,
valueField: 'id',
labelField: 'title',
labelField: 'name',
onChange: changeSourceAccount,
onSelectItem: selectSourceAccount
});
@@ -217,7 +214,7 @@ let transactions = function () {
selector: 'input.ac-dest',
serverUrl: urls.account,
valueField: 'id',
labelField: 'title',
labelField: 'name',
account_types: this.filters.destination,
onRenderItem: renderAccount,
onChange: changeDestinationAccount,
@@ -227,7 +224,7 @@ let transactions = function () {
selector: 'input.ac-category',
serverUrl: urls.category,
valueField: 'id',
labelField: 'title',
labelField: 'name',
onChange: changeCategory,
onSelectItem: changeCategory
});
@@ -330,7 +327,7 @@ let transactions = function () {
// load meta data.
loadCurrencies().then(data => {
this.formStates.loadingCurrencies = false;
this.formData.defaultCurrency = data.defaultCurrency;
this.formData.primaryCurrency = data.primaryCurrency;
this.formData.enabledCurrencies = data.enabledCurrencies;
this.formData.primaryCurrencies = data.primaryCurrencies;
this.formData.foreignCurrencies = data.foreignCurrencies;

8
resources/assets/v2/src/pages/transactions/shared/load-currencies.js
View File

@@ -28,7 +28,7 @@ export function loadCurrencies() {
let getter = new Get();
return getter.list(params).then((response) => {
let returnData = {
defaultCurrency: {},
primaryCurrency: {},
primaryCurrencies: [],
foreignCurrencies: [],
enabledCurrencies: [],
@@ -46,13 +46,13 @@ export function loadCurrencies() {
id: current.id,
name: current.attributes.name,
code: current.attributes.code,
default: current.attributes.default,
primary: current.attributes.primary,
symbol: current.attributes.symbol,
decimal_places: current.attributes.decimal_places,
};
if (obj.default) {
returnData.defaultCurrency = obj;
if (obj.primary) {
returnData.primaryCurrency = obj;
}
returnData.enabledCurrencies.push(obj);
returnData.primaryCurrencies.push(obj);