From 5674323d2aee9a72f7a0cf0a63a18118793ffc8d Mon Sep 17 00:00:00 2001 From: Peter Zimon Date: Tue, 26 Nov 2019 13:38:43 +0100 Subject: [PATCH] Removed link to settings for admins in email error copy --- ghost/admin/app/components/modal-confirm-email-send.js | 3 +++ .../templates/components/gh-post-settings-menu/email.hbs | 6 +++++- .../app/templates/components/modal-confirm-email-send.hbs | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ghost/admin/app/components/modal-confirm-email-send.js b/ghost/admin/app/components/modal-confirm-email-send.js index 3695ae69d9..717431121d 100644 --- a/ghost/admin/app/components/modal-confirm-email-send.js +++ b/ghost/admin/app/components/modal-confirm-email-send.js @@ -1,7 +1,10 @@ import ModalComponent from 'ghost-admin/components/modal-base'; +import {inject as service} from '@ember/service'; import {task} from 'ember-concurrency'; export default ModalComponent.extend({ + session: service(), + errorMessage: null, // Allowed actions diff --git a/ghost/admin/app/templates/components/gh-post-settings-menu/email.hbs b/ghost/admin/app/templates/components/gh-post-settings-menu/email.hbs index b36e582b08..aedbee60c0 100644 --- a/ghost/admin/app/templates/components/gh-post-settings-menu/email.hbs +++ b/ghost/admin/app/templates/components/gh-post-settings-menu/email.hbs @@ -50,7 +50,11 @@

- Email failed to send when publishing this post. Please check your Mailgun configuration if the error persists. + {{#if this.session.user.isOwner}} + Email failed to send when publishing this post. Please check your Mailgun configuration if the error persists. + {{else}} + Email failed to send when publishing this post. Please check your Mailgun configuration if the error persists. + {{/if}}

diff --git a/ghost/admin/app/templates/components/modal-confirm-email-send.hbs b/ghost/admin/app/templates/components/modal-confirm-email-send.hbs index e98e72df89..59d95b895c 100644 --- a/ghost/admin/app/templates/components/modal-confirm-email-send.hbs +++ b/ghost/admin/app/templates/components/modal-confirm-email-send.hbs @@ -32,7 +32,11 @@