From 904114d84436cc6292626de21db078c24bb8b0a0 Mon Sep 17 00:00:00 2001 From: Rish Date: Wed, 6 Nov 2019 18:18:09 +0700 Subject: [PATCH] Added email subject to preview modal header --- ghost/admin/app/components/modal-post-email-preview.js | 7 +++++-- .../app/templates/components/modal-post-email-preview.hbs | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ghost/admin/app/components/modal-post-email-preview.js b/ghost/admin/app/components/modal-post-email-preview.js index 6937559fa0..438ca57fc7 100644 --- a/ghost/admin/app/components/modal-post-email-preview.js +++ b/ghost/admin/app/components/modal-post-email-preview.js @@ -8,8 +8,8 @@ export default ModalComponent.extend({ ajax: service(), type: 'desktop', previewHtml: '', + previewEmailSubject: null, post: alias('model'), - actions: { changeType(type) { this.set('type', type); @@ -21,10 +21,12 @@ export default ModalComponent.extend({ const resourceId = this.post.id; const url = this.get('ghostPaths.url').api('/email_preview/posts', resourceId); let htmlData = this.get('previewHtml'); + let emailSubject = this.get('previewEmailSubject'); if (!htmlData) { - const response = await this.ajax.request(`${url}?status=all`); + const response = await this.ajax.request(url); let [emailPreview] = response.email_previews; htmlData = emailPreview.html; + emailSubject = emailPreview.subject; } let iframe = this.element.querySelector('iframe'); @@ -34,6 +36,7 @@ export default ModalComponent.extend({ iframe.contentWindow.document.close(); } this.set('previewHtml', htmlData); + this.set('previewEmailSubject', emailSubject); } catch (error) { // re-throw if we don't have a validation error if (error) { diff --git a/ghost/admin/app/templates/components/modal-post-email-preview.hbs b/ghost/admin/app/templates/components/modal-post-email-preview.hbs index fc13d85ae4..2772713c87 100644 --- a/ghost/admin/app/templates/components/modal-post-email-preview.hbs +++ b/ghost/admin/app/templates/components/modal-post-email-preview.hbs @@ -1,5 +1,5 @@