OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent warnings from being displayed in email after content import

Browse Source 
no issue

Warnings that aren't useful shouldn't be displayed, especially when this is likely someone's first experience of Ghost.
This commit is contained in:
Sam Lord 2022-11-16 17:06:16 +00:00
parent 6a17b684ec
commit 4fb05ab165
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/admin/app/components/modal-import-content.hbs
View File

@ -1,5 +1,5 @@
<div class="gh-content-import-wrapper">
{{#if (eq this.state 'INIT')}}
{{#if (or (eq this.state 'INIT') (eq this.state 'UPLOADING'))}}
<header class="modal-header" data-test-modal="import-content">
<h1>Import content</h1>
</header>

16
ghost/core/core/server/data/importer/email-template.js
View File

@ -143,22 +143,6 @@ module.exports = ({result, siteUrl, postsUrl, emailRecipient}) => `
</td>
</tr>
` : ''}
${result.problems && result.problems.length > 0 ? `
<tr>
<td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-bottom: 16px;">
<p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 0px;">Imported content successfully, but with the following warning${result.problems.length > 1 ? 's' : ''}:</p>
</td>
</tr>
<tr>
<td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-bottom: 16px;">
<ul style="padding-left: 2em;">
${_.map(result.problems, problem => `
<li style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 4px;">${problem.message}</li>
`).join('\n')}
</ul>
</td>
</tr>
` : ''}
${result.data && result.data.posts && result.data.posts.length > 0 ? `
<tr>
<td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-bottom: 12px; padding-top: 16px;">