1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-22 22:59:43 +02:00

Merge code between editions

This commit is contained in:
Harvey Kandola 2018-11-07 15:56:05 +00:00
parent d1b803b246
commit 6a9ad7f540
20 changed files with 365 additions and 110 deletions

View file

@ -13,9 +13,10 @@ import $ from 'jquery';
import { notEmpty } from '@ember/object/computed';
import { inject as service } from '@ember/service'
import ModalMixin from '../../mixins/modal';
import TooltipMixin from '../../mixins/tooltip';
import Component from '@ember/component';
export default Component.extend(ModalMixin, {
export default Component.extend(ModalMixin, TooltipMixin, {
classNames: ['layout-header', 'non-printable'],
tagName: 'header',
folderService: service('folder'),
@ -69,6 +70,8 @@ export default Component.extend(ModalMixin, {
this.eventBus.subscribe('pinChange', this, 'setupPins');
this.setupPins();
}
this.renderTooltips();
},
setupPins() {
@ -87,6 +90,7 @@ export default Component.extend(ModalMixin, {
willDestroyElement() {
this._super(...arguments);
this.removeTooltips();
this.eventBus.unsubscribe('pinChange');
},
@ -113,6 +117,14 @@ export default Component.extend(ModalMixin, {
this.get('session').seenNewVersion();
this.set('hasWhatsNew', false);
}
},
onBilling() {
if (!this.get('session.isAdmin')) {
return;
}
this.get('router').transitionTo('customize.billing');
}
}
});