From 7faff0993efea9d9cb0f3f6aab3acf08c596770c Mon Sep 17 00:00:00 2001 From: Rish Date: Tue, 5 Nov 2019 18:23:08 +0700 Subject: [PATCH] Hide members mail config setting in admin no issue --- .../app/components/gh-members-lab-setting.js | 6 ++++- .../components/gh-members-lab-setting.hbs | 26 ++++++++++--------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ghost/admin/app/components/gh-members-lab-setting.js b/ghost/admin/app/components/gh-members-lab-setting.js index abe47adee6..38d0d1eb39 100644 --- a/ghost/admin/app/components/gh-members-lab-setting.js +++ b/ghost/admin/app/components/gh-members-lab-setting.js @@ -23,11 +23,15 @@ export default Component.extend({ subscriptionSettings.stripeConfig = stripeProcessor.config; subscriptionSettings.allowSelfSignup = !!subscriptionSettings.allowSelfSignup; subscriptionSettings.fromAddress = subscriptionSettings.fromAddress || ''; - subscriptionSettings.mailgunApiKey = subscriptionSettings.mailgunApiKey || ''; return subscriptionSettings; }), + hasMailgunAPIKeyOption: computed('settings.membersSubscriptionSettings', function () { + let subscriptionSettings = this.parseSubscriptionSettings(this.get('settings.membersSubscriptionSettings')); + return Object.keys(subscriptionSettings).includes('mailgunApiKey'); + }), + defaultContentVisibility: computed('settings.defaultContentVisibility', function () { return this.get('settings.defaultContentVisibility'); }), diff --git a/ghost/admin/app/templates/components/gh-members-lab-setting.hbs b/ghost/admin/app/templates/components/gh-members-lab-setting.hbs index a0459fd8c6..cbe1829304 100644 --- a/ghost/admin/app/templates/components/gh-members-lab-setting.hbs +++ b/ghost/admin/app/templates/components/gh-members-lab-setting.hbs @@ -185,18 +185,20 @@
Your members will receive system emails from this address
{{/gh-form-group}} - {{#gh-form-group}} - - {{gh-text-input - type="password" - value=(readonly subscriptionSettings.mailgunApiKey) - input=(action "setSubscriptionSettings" "mailgunApiKey") - class="mt1 password" - }} - - Find your Mailgun API keys here » - - {{/gh-form-group}} + {{#if hasMailgunAPIKeyOption}} + {{#gh-form-group}} + + {{gh-text-input + type="password" + value=(readonly subscriptionSettings.mailgunApiKey) + input=(action "setSubscriptionSettings" "mailgunApiKey") + class="mt1 password" + }} + + Find your Mailgun API keys here » + + {{/gh-form-group}} + {{/if}} {{/liquid-if}}