mirror of
https://github.com/documize/community.git
synced 2025-08-04 21:15:24 +02:00
support for persona 5.7+ and prep'ed support for MariaDB 10.2+
This commit is contained in:
parent
f12cdfbd45
commit
e31c6e12a2
13 changed files with 768 additions and 682 deletions
14
app/app/pods/auth/sso/controller.js
Normal file
14
app/app/pods/auth/sso/controller.js
Normal file
|
@ -0,0 +1,14 @@
|
|||
// 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 Ember from 'ember';
|
||||
|
||||
export default Ember.Controller.extend({});
|
|
@ -15,7 +15,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout
|
|||
export default Ember.Route.extend(AuthenticatedRouteMixin, {
|
||||
folderService: Ember.inject.service('folder'),
|
||||
|
||||
model: function () {
|
||||
model() {
|
||||
return this.get('folderService').getAll();
|
||||
}
|
||||
});
|
||||
|
|
|
@ -35,4 +35,4 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
|
|||
controller.set('model', model);
|
||||
controller.set("folder", this.get('folderService.currentFolder'));
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
@ -39,9 +39,10 @@ export default Ember.Route.extend(ApplicationRouteMixin, TooltipMixin, {
|
|||
this.destroyTooltips();
|
||||
},
|
||||
|
||||
error(error /*, transition*/ ) {
|
||||
error(error, transition) {
|
||||
if (error) {
|
||||
console.log(error);
|
||||
console.log(transition);
|
||||
|
||||
if (netUtil.isAjaxAccessError(error)) {
|
||||
localStorage.clear();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue