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

Fix #2573

Browse Source
This commit is contained in:
James Cole
2019-09-12 06:47:04 +02:00
parent a0780e434e
commit 88c08188f7
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
database/migrations/2016_08_25_091522_changes_for_3101.php
View File

@@ -35,7 +35,7 @@ class ChangesFor3101 extends Migration
{ {
Schema::table( Schema::table(
'import_jobs', 'import_jobs',
function (Blueprint $table) { static function (Blueprint $table) {
$table->dropColumn('extended_status'); $table->dropColumn('extended_status');
} }
); );
@@ -50,7 +50,7 @@ class ChangesFor3101 extends Migration
{ {
Schema::table( Schema::table(
'import_jobs', 'import_jobs',
function (Blueprint $table) { static function (Blueprint $table) {
$table->text('extended_status')->nullable(); $table->text('extended_status')->nullable();
} }
); );

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

File diff suppressed because one or more lines are too long

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

@@ -664,9 +664,12 @@
for (const fileKey in attachments[key].files) { for (const fileKey in attachments[key].files) {
if (attachments[key].files.hasOwnProperty(fileKey) && /^0$|^[1-9]\d*$/.test(fileKey) && fileKey <= 4294967294) { if (attachments[key].files.hasOwnProperty(fileKey) && /^0$|^[1-9]\d*$/.test(fileKey) && fileKey <= 4294967294) {
// include journal thing. // include journal thing.
let transactions = response.data.data.attributes.transactions.reverse();
toBeUploaded.push( toBeUploaded.push(
{ {
journal: response.data.data.attributes.transactions[key].transaction_journal_id, journal: transactions[key].transaction_journal_id,
file: attachments[key].files[fileKey] file: attachments[key].files[fileKey]
} }
); );
@@ -864,13 +867,13 @@
this.transactions[transactionIndex].errors.foreign_amount.concat(errors.errors[key]); this.transactions[transactionIndex].errors.foreign_amount.concat(errors.errors[key]);
break; break;
} }
}
// unique some things
this.transactions[transactionIndex].errors.source_account =
Array.from(new Set(this.transactions[transactionIndex].errors.source_account));
this.transactions[transactionIndex].errors.destination_account =
Array.from(new Set(this.transactions[transactionIndex].errors.destination_account));
// unique some things
this.transactions[transactionIndex].errors.source_account =
Array.from(new Set(this.transactions[transactionIndex].errors.source_account));
this.transactions[transactionIndex].errors.destination_account =
Array.from(new Set(this.transactions[transactionIndex].errors.destination_account));
}
} }
} }
}, },