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

Fixed member state for portal preview page

Browse source 
closes https://github.com/TryGhost/members.js/issues/67

- Portal preview state was incorrectly adding logged-in member state
- Updates member state to be used only for account pages
This commit is contained in:
Rish 2020-07-13 17:48:34 +05:30
parent 9da9c3a21e
commit 4c43a1bc9e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ghost/portal/src/App.js
View file

@ -85,7 +85,7 @@ export default class App extends React.Component {
...this.state.site, ...this.state.site,
...(previewSite || {}) ...(previewSite || {})
}, },
member: this.state.member || this.getPreviewMember(), member: this.getPreviewMember(this.state.member),
...restPreview ...restPreview
}); });
} }
@ -168,13 +168,13 @@ export default class App extends React.Component {
} }
} }
getPreviewMember() { getPreviewMember(member) {
const [path, qs] = window.location.hash.substr(1).split('?'); const [path, qs] = window.location.hash.substr(1).split('?');
if (path === '/portal' && qs) { if (path === '/portal' && qs) {
const {site: previewSite, ...restPreview} = this.getPreviewState(); const {site: previewSite, ...restPreview} = this.getPreviewState();
if (restPreview.page.includes('account')) { if (restPreview.page.includes('account')) {
return Fixtures.member.free; return member || Fixtures.member.free;
} }
return null; return null;
} }
@ -197,7 +197,7 @@ export default class App extends React.Component {
...site, ...site,
...(previewSite || {}) ...(previewSite || {})
}, },
member: member || this.getPreviewMember(), member: this.getPreviewMember(member),
page, page,
showPopup, showPopup,
action: 'init:success', action: 'init:success',