1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-19 13:19: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

@ -0,0 +1,39 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
//
// This software (Documize Community Edition) is licensed under
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
//
// You can operate outside the AGPL restrictions by purchasing
// Documize Enterprise Edition and obtaining a commercial license
// by contacting <sales@documize.com>.
//
// https://documize.com
import $ from 'jquery';
import { inject as service } from '@ember/service';
import Notifier from '../../mixins/notifier';
import Component from '@ember/component';
export default Component.extend(Notifier, {
appMeta: service(),
global: service(),
changelog: '',
init() {
this._super(...arguments);
let self = this;
let cacheBuster = + new Date();
$.ajax({
url: `https://storage.googleapis.com/documize/news/summary.html?cb=${cacheBuster}`,
type: 'GET',
dataType: 'html',
success: function (response) {
self.set('changelog', response);
}
});
},
actions: {
}
});

View file

@ -9,7 +9,6 @@
//
// https://documize.com
import $ from 'jquery';
import { empty } from '@ember/object/computed';
import { inject as service } from '@ember/service';
import Notifier from '../../mixins/notifier';
@ -18,20 +17,21 @@ import Component from '@ember/component';
export default Component.extend(Notifier, {
appMeta: service(),
global: service(),
LicenseError: empty('license'),
changelog: '',
licenseError: empty('license'),
subscription: null,
planCloud: false,
planSelfhost: false,
init() {
didReceiveAttrs() {
this._super(...arguments);
let self = this;
let cacheBuster = + new Date();
$.ajax({
url: `https://storage.googleapis.com/documize/news/summary.html?cb=${cacheBuster}`,
type: 'GET',
dataType: 'html',
success: function (response) {
self.set('changelog', response);
this.get('global').getSubscription().then((subs) => {
this.set('subscription', subs);
if (subs.plan === 'Installed') {
this.set('planCloud', false);
this.set('planSelfhost', true);
} else {
this.set('planCloud', true);
this.set('planSelfhost', false);
}
});
},
@ -40,7 +40,7 @@ export default Component.extend(Notifier, {
saveLicense() {
this.showWait();
this.get('global').saveLicense(this.get('license')).then(() => {
this.get('global').setLicense(this.get('license')).then(() => {
this.showDone();
window.location.reload();
});