TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-26 20:34:02 +03:00
Code Issues Projects Releases Wiki Activity

defer navigation display until user promise is fulfilled

Browse Source
This commit is contained in:
Kevin Ansfield 2017-02-01 19:19:42 +00:00 committed by Austin Burdine
parent 7e14378a63
commit a75f6f8579
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ghost/admin/app/controllers/application.js
View File

@ -6,7 +6,13 @@ export default Controller.extend({
dropdown: injectService(),
session: injectService(),
showNavMenu: computed('currentPath', 'session.isAuthenticated', function () {
showNavMenu: computed('currentPath', 'session.isAuthenticated', 'session.user.isFulfilled', function () {
// we need to defer showing the navigation menu until the session.user
// promise has fulfilled so that gh-user-can-admin has the correct data
if (!this.get('session.isAuthenticated') || !this.get('session.user.isFulfilled')) {
return false;
}
return (this.get('currentPath') !== 'error404' || this.get('session.isAuthenticated'))
&& !this.get('currentPath').match(/(signin|signup|setup|reset)/);
}),