kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-04 20:11:54 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2465 and #2463

Browse Source
This commit is contained in:
James Cole
2019-08-23 06:10:03 +02:00
parent 57b2a8d459
commit 3d444eb833
5 changed files with 59487 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59482
public/v1/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

8
resources/assets/js/components/transactions/Budget.vue
View File

@@ -24,9 +24,11 @@
v-bind:class="{ 'has-error': hasError()}" v-bind:class="{ 'has-error': hasError()}"
v-if="typeof this.transactionType === 'undefined' || this.transactionType === 'withdrawal' || this.transactionType === 'Withdrawal' || this.transactionType === '' || null === this.transactionType"> v-if="typeof this.transactionType === 'undefined' || this.transactionType === 'withdrawal' || this.transactionType === 'Withdrawal' || this.transactionType === '' || null === this.transactionType">
<div class="col-sm-12"> <div class="col-sm-12">
<select name="budget[]" ref="budget" @input="handleInput" class="form-control" <select name="budget[]" ref="budget" v-model="value" @input="handleInput" class="form-control"
v-if="this.budgets.length > 0"> v-if="this.budgets.length > 0">
<option v-for="budget in this.budgets" :label="budget.name" :value="budget.id">{{budget.name}}</option> <option v-for="cBudget in this.budgets" :label="cBudget.name" :value="cBudget.id"
>{{cBudget.name}}</option>
</select> </select>
<ul class="list-unstyled" v-for="error in this.error"> <ul class="list-unstyled" v-for="error in this.error">
<li class="text-danger">{{ error }}</li> <li class="text-danger">{{ error }}</li>
@@ -41,6 +43,8 @@
props: ['transactionType', 'value', 'error'], props: ['transactionType', 'value', 'error'],
mounted() { mounted() {
this.loadBudgets(); this.loadBudgets();
console.log('budget value');
console.log(this.value);
}, },
data() { data() {
return { return {

3
resources/assets/js/components/transactions/CreateTransaction.vue
View File

@@ -369,9 +369,6 @@
submit(e) { submit(e) {
const uri = './api/v1/transactions?_token=' + document.head.querySelector('meta[name="csrf-token"]').content; const uri = './api/v1/transactions?_token=' + document.head.querySelector('meta[name="csrf-token"]').content;
const data = this.convertData(); const data = this.convertData();
if (this.resetFormAfter) {
this.resetTransactions();
}
let button = $(e.currentTarget); let button = $(e.currentTarget);
button.prop("disabled", true); button.prop("disabled", true);

7
resources/assets/js/components/transactions/EditTransaction.vue
View File

@@ -147,13 +147,6 @@
v-model="transaction.category" v-model="transaction.category"
:error="transaction.errors.category" :error="transaction.errors.category"
></category> ></category>
<!--
<piggy-bank
:transactionType="transactionType"
v-model="transaction.piggy_bank"
:error="transaction.errors.piggy_bank"
></piggy-bank>
-->
<tags <tags
:tags="transaction.tags" :tags="transaction.tags"
v-model="transaction.tags" v-model="transaction.tags"

1
resources/assets/js/components/transactions/TransactionDescription.vue
View File

@@ -61,7 +61,6 @@
return { return {
descriptionAutoCompleteURI: null, descriptionAutoCompleteURI: null,
name: null, name: null,
value: null,
description: null, description: null,
target: null, target: null,
} }