mirror of
https://github.com/documize/community.git
synced 2025-07-27 09:09:44 +02:00
Merge branch 'master' into trello-improvements
This commit is contained in:
commit
52da8d6f50
1 changed files with 4 additions and 10 deletions
|
@ -53,17 +53,11 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
|
||||||
}
|
}
|
||||||
|
|
||||||
// If model has any folders redirect to dashboard
|
// If model has any folders redirect to dashboard
|
||||||
if (model.length > 0) {
|
if (model.get('length') > 0) {
|
||||||
let folder = model[0];
|
let folder = model[0];
|
||||||
Ember.set(this, 'folder', folder);
|
Ember.set(this, 'folder', folder);
|
||||||
this.transitionTo('folders.folder', folder.get('id'), folder.get('slug'));
|
this.transitionTo('folders.folder', folder.get('id'), folder.get('slug'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// has no folders, create default folder
|
|
||||||
return this.get('folderService').add({ name: "My Space" }).then((folder) => {
|
|
||||||
Ember.set(this, 'folder', folder);
|
|
||||||
this.transitionTo('folders.folder', folder.get('id'), folder.get('slug'));
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//If folder route has params
|
//If folder route has params
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue