diff --git a/ghost/admin/app/components/modal-import-content/content-file-select.js b/ghost/admin/app/components/modal-import-content/content-file-select.js
index fbb575c383..e1ae481452 100644
--- a/ghost/admin/app/components/modal-import-content/content-file-select.js
+++ b/ghost/admin/app/components/modal-import-content/content-file-select.js
@@ -66,7 +66,6 @@ export default class ContentFileSelect extends Component {
}
_validateFileType(file) {
- console.log(file);
let [, extension] = (/(?:\.([^.]+))?$/).exec(file.name);
if (extension.toLowerCase() !== 'json' && extension.toLowerCase() !== 'zip') {
diff --git a/ghost/core/core/server/data/importer/email-template.js b/ghost/core/core/server/data/importer/email-template.js
index 3061b50807..f00faec18c 100644
--- a/ghost/core/core/server/data/importer/email-template.js
+++ b/ghost/core/core/server/data/importer/email-template.js
@@ -124,32 +124,23 @@ module.exports = ({result, siteUrl, postsUrl, emailRecipient}) => `
|
- ${result.errors ? 'Your content import was unsuccessful' : 'Your content import has finished'}
+ ${result.data.problems ? 'Import unsuccessful' : 'Your content import has finished'}
|
- ${result.errors ? `
+ ${result.data.problems.length ? `
- |
- Failed to import content with the following error${result.errors.length > 1 ? 's' : ''}:
- |
+ Your content could not be imported. |
+ ` : `
-
-
- ${_.map(result.errors, error => `
- - ${error.message}
- `).join('\n')}
-
- |
+ Your content was successfully imported. |
- ` : ''}
- ${result.data && result.data.posts && result.data.posts.length > 0 ? `
+ `}
|
- View imported posts
+ View posts
|
- ` : ''}
diff --git a/ghost/core/core/server/data/importer/import-manager.js b/ghost/core/core/server/data/importer/import-manager.js
index 7502a5918a..1fa7748065 100644
--- a/ghost/core/core/server/data/importer/import-manager.js
+++ b/ghost/core/core/server/data/importer/import-manager.js
@@ -445,15 +445,15 @@ class ImportManager {
if (!env?.startsWith('testing')) {
// Step 6: Send email
- const email = this.generateCompletionEmail(importResult?.data, {
+ const email = this.generateCompletionEmail(importResult, {
emailRecipient: importOptions.user.email,
importTag: importOptions.importTag
});
await ghostMailer.send({
to: importOptions.user.email,
- subject: importResult.errors
- ? 'Your content import has finished'
- : 'Your content import was unsuccessful',
+ subject: importResult.data.problems.length
+ ? 'Your content import was unsuccessful'
+ : 'Your content import has finished',
html: email
});
}