kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 22:48:18 +00:00
Code Issues Projects Releases Wiki Activity

Fake import works, won't fire rules yet. also needs a state.

Browse Source
This commit is contained in:
James Cole
2018-05-03 18:17:59 +02:00
parent 6bddb63b45
commit 480d65fc1f
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Import/JobStatusController.php
View File

@@ -102,7 +102,17 @@ class JobStatusController extends Controller
'tag_name' => null === $importJob->tag_id ? null : $importJob->tag->tag,
'journals' => $extendedStatus['count'] ?? 0,
'journals_text' => trans_choice('import.status_with_count', $extendedStatus['count'] ?? 0),
'tag_text' => '',
];
if (null !== $importJob->tag_id) {
$json['tag_text'] = trans(
'import.status_finished_job',
['count' => $extendedStatus['count'],
'link' => route('tags.show', [$importJob->tag_id]),
'tag' => $importJob->tag->tag,
]
);
}
return response()->json($json);
}
@@ -230,8 +240,6 @@ class JobStatusController extends Controller
}
}
// /**