Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Disabled portal subscription options when signup is disabled

Browse source 
refs https://github.com/TryGhost/Team/issues/579

- subscription access set to 'invite' or 'none' disables signup so it doesn't make sense to allow those options to be changed when the portal preview won't reflect the settings
- fixed "expand"/"close" button not changing on the access screen signup access block
This commit is contained in:
Kevin Ansfield 2021-04-27 15:36:45 +01:00
parent 68c07bde4c
commit 6a039be595
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ghost/admin/app/components/modal-portal-settings.hbs
View file

@ -4,7 +4,7 @@
<h2 class="gh-portal-settings-title">Portal settings</h2>
<div class="gh-portal-form-wrapper">
<fieldset class="gh-portal-settings-form">
<div class="gh-portal-setting-section" onclick={{action "switchToSignupPage"}}>
<div class="gh-portal-setting-section {{if (not-eq this.settings.membersSignupAccess "all") "disabled-overlay"}}" onclick={{action "switchToSignupPage"}}>
<h3 class="gh-portal-setting-sectionheading">Signup options</h3>
<GhFormGroup @classNames="gh-members-subscribed-checkbox gh-portal-setting-first pb5 mb0">
<div class="flex justify-between items-center">
@ -21,7 +21,8 @@
checked={{this.settings.portalName}}
id="signup-name-checkbox"
name="signup-name-checkbox"
onclick={{action "togglePortalName" value="target.checked"}}
disabled={{not-eq this.settings.membersSignupAccess "all"}}
{{on "click" (action "togglePortalName" value="target.checked")}}
>
<span class="input-toggle-component"></span>
</label>
@ -43,9 +44,9 @@
checked={{this.isFreeChecked}}
id="free-plan"
name="free-plan"
disabled={{not this.allowSelfSignup}}
disabled={{or (not this.isStripeConfigured) (not-eq this.settings.membersSignupAccess "all")}}
class="gh-input post-settings-featured"
onclick={{action "toggleFreePlan" value="target.checked"}}
{{on "click" (action "toggleFreePlan" value="target.checked")}}
data-test-checkbox="featured"
>
<span class="input-toggle-component"></span>
@ -62,9 +63,9 @@
id="monthly-plan"
name="monthly-plan"
checked={{this.isMonthlyChecked}}
disabled={{not this.isStripeConfigured}}
disabled={{or (not this.isStripeConfigured) (not-eq this.settings.membersSignupAccess "all")}}
class="gh-input post-settings-featured"
onclick={{action "toggleMonthlyPlan" value="target.checked"}}
{{on "click" (action "toggleMonthlyPlan" value="target.checked")}}
data-test-checkbox="featured"
>
<span class="input-toggle-component"></span>
@ -81,9 +82,9 @@
id="yearly-plan"
name="yearly-plan"
checked={{this.isYearlyChecked}}
disabled={{not this.isStripeConfigured}}
disabled={{or (not this.isStripeConfigured) (not-eq this.settings.membersSignupAccess "all")}}
class="gh-input post-settings-featured"
onclick={{action "toggleYearlyPlan" value="target.checked"}}
{{on "click" (action "toggleYearlyPlan" value="target.checked")}}
data-test-checkbox="featured"
>
<span class="input-toggle-component"></span>

2
ghost/admin/app/templates/settings/members-access.hbs
View file

@ -25,7 +25,7 @@
<h4 class="gh-expandable-title">Subscription access</h4>
<p class="gh-expandable-description">Who should be able to subscribe to your site?</p>
</div>
<button type="button" class="gh-btn" {{on "click" this.toggleSignupAccess}} data-test-toggle="subscription-access"><span>{{if this.subscriptionAccessOpen "Close" "Expand"}}</span></button>
<button type="button" class="gh-btn" {{on "click" this.toggleSignupAccess}} data-test-toggle="subscription-access"><span>{{if this.signupAccessOpen "Close" "Expand"}}</span></button>
</div>
<div class="gh-expandable-content">
{{#liquid-if this.signupAccessOpen}}