Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-26 00:29:47 +02:00
Code Releases Activity

cosmetics

Browse source
This commit is contained in:
Harvey Kandola 2017-03-22 11:34:49 +00:00
parent af97efec83
commit 90eb4f9517
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/app/routes/application.js
View file

@ -24,6 +24,8 @@ export default Ember.Route.extend(ApplicationRouteMixin, TooltipMixin, {
pinned: service(), pinned: service(),
beforeModel(transition) { beforeModel(transition) {
this._super(...arguments);
return this.get('appMeta').boot(transition.targetName).then(data => { return this.get('appMeta').boot(transition.targetName).then(data => {
if (this.get('session.session.authenticator') !== "authenticator:documize" && if (this.get('session.session.authenticator') !== "authenticator:documize" &&
this.get('session.session.authenticator') !== "authenticator:keycloak" && this.get('session.session.authenticator') !== "authenticator:keycloak" &&
@ -52,8 +54,7 @@ export default Ember.Route.extend(ApplicationRouteMixin, TooltipMixin, {
} }
} }
// Return true to bubble this event to any parent route. return true; // bubble this event to any parent route
return true;
} }
} }
}); });

2
app/app/services/session.js
View file

@ -42,7 +42,7 @@ export default SimpleAuthSession.extend({
return data.get('global'); return data.get('global');
}), }),
init: function () { init() {
this._super(...arguments); this._super(...arguments);
this.set('isMac', is.mac()); this.set('isMac', is.mac());