This commit is contained in:
James Cole 2016-12-18 09:27:27 +01:00
parent 7ecd691ee2
commit 279d7769f5
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
4 changed files with 20 additions and 3 deletions

View File

@ -145,10 +145,13 @@ class ImportController extends Controller
return $this->redirectToCorrectStep($job);
}
// if there is a tag (there might not be), we can link to it:
$tagId = $job->extended_status['importTag'] ?? 0;
$subTitle = trans('firefly.import_finished');
$subTitleIcon = 'fa-star';
return view('import.finished', compact('job', 'subTitle', 'subTitleIcon'));
return view('import.finished', compact('job', 'subTitle', 'subTitleIcon', 'tagId'));
}
/**

View File

@ -937,4 +937,7 @@ return [
'bread_crumb_import_complete' => 'Import ":key" complete',
'bread_crumb_configure_import' => 'Configure import ":key"',
'bread_crumb_import_finished' => 'Import ":key" finished',
'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.',
'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the <a href="tags/show/:tag">tag that was created for this import</a>.',
];

View File

@ -1161,7 +1161,7 @@
"total_steps": 0,
"errors": [],
"import_count": 0,
"importTag": 0
"importTag": 1
},
"configuration": {
}

View File

@ -11,7 +11,18 @@
<h3 class="box-title">{{ 'import_finished'|_ }}</h3>
</div>
<div class="box-body">
This import has beeen done. Link to tag or set of transactions.
<p>
{{ 'import_finished_intro'|_ }}
</p>
{% if tagId > 0 %}
<p>
{{ trans('firefly.import_finished_text_with_link', {tag: tagId})|raw }}
</p>
{% else %}
<p>
{{ 'import_finished_text_without_link'|_ }}
</p>
{% endif %}
<p>
{{ 'import_share_configuration'|_ }}