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

Fix some button issues.

Browse Source
This commit is contained in:
James Cole
2020-02-13 20:09:59 +01:00
parent 529cb3d387
commit fd04a38359
7 changed files with 351 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,7 +377,7 @@
const uri = './api/v1/transactions?_token=' + document.head.querySelector('meta[name="csrf-token"]').content;
const data = this.convertData();
let button = $(e.currentTarget);
let button = $('#submitButton');
button.prop("disabled", true);
axios.post(uri, data).then(response => {
@@ -385,7 +385,7 @@
// this method will ultimately send the user on (or not).
if (0 === this.collectAttachmentData(response)) {
// console.log('Will now go to redirectUser()');
this.redirectUser(response.data.data.id, button, response.data.data);
this.redirectUser(response.data.data.id, response.data.data);
}
}).catch(error => {
// give user errors things back.
@@ -393,8 +393,10 @@
console.error('Error in transaction submission.');
console.error(error);
this.parseErrors(error.response.data);
// something.
button.prop("disabled", false);
console.log('enable button again.')
button.removeAttr('disabled');
});
if (e) {
@@ -406,7 +408,7 @@
div.innerText = unsafeText;
return div.innerHTML;
},
redirectUser(groupId, button, transactionData) {
redirectUser(groupId, transactionData) {
// console.log('In redirectUser()');
// console.log(transactionData);
let title = null === transactionData.attributes.group_title ? transactionData.attributes.transactions[0].description : transactionData.attributes.group_title;
@@ -427,9 +429,9 @@
// clear errors:
this.setDefaultErrors();
if (button) {
button.prop("disabled", false);
}
console.log('enable button again.')
let button = $('#submitButton');
button.removeAttr('disabled');
} else {
// console.log('Will redirect to previous URL. (' + previousUri + ')');
window.location.href = window.previousUri + '?transaction_group_id=' + groupId + '&message=created';
@@ -520,7 +522,7 @@
if (uploads === count) {
// finally we can redirect the user onwards.
// console.log('FINAL UPLOAD');
this.redirectUser(groupId, null, transactionData);
this.redirectUser(groupId, transactionData);
}
// console.log('Upload complete!');
return true;
@@ -532,7 +534,7 @@
if (uploads === count) {
// finally we can redirect the user onwards.
// console.log('FINAL UPLOAD');
this.redirectUser(groupId, null, transactionData);
this.redirectUser(groupId, transactionData);
}
// console.log('Upload complete!');
return false;

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

@@ -621,7 +621,7 @@
}
const data = this.convertData();
let button = $(e.currentTarget);
let button = $('#submitButton');
button.prop("disabled", true);
//axios.put(uri, data)
@@ -642,7 +642,7 @@
if (e) {
e.preventDefault();
}
button.prop("disabled", false);
button.removeAttr('disabled');
},
redirectUser(groupId) {