Skip to content
Snippets Groups Projects
Commit a3fbb7b2 authored by Eugen Ciur's avatar Eugen Ciur
Browse files

It works!

parent 3cf434b4
No related branches found
Tags
No related merge requests found
...@@ -9,5 +9,19 @@ export default class BaseRoute extends Route { ...@@ -9,5 +9,19 @@ export default class BaseRoute extends Route {
async beforeModel(transition) { async beforeModel(transition) {
this.session.requireAuthentication(transition, 'login'); this.session.requireAuthentication(transition, 'login');
await this.currentUser.loadCurrentUser(); await this.currentUser.loadCurrentUser();
if (this.currentUser.user) {
await this.currentUser.user.home_folder;
}
}
setupController(controller, model) {
super.setupController(...arguments);
let app_controller = this.controllerFor('authenticated');
this.currentUser.user.home_folder.then((home_folder) => {
app_controller.set('home_folder', home_folder);
});
} }
} }
...@@ -11,4 +11,8 @@ export default class ApplicationRoute extends BaseRoute { ...@@ -11,4 +11,8 @@ export default class ApplicationRoute extends BaseRoute {
return this.currentUser.user.home_folder; return this.currentUser.user.home_folder;
} }
} }
setupController(controller, model) {
controller.set('home_folder', model);
}
} }
...@@ -19,4 +19,5 @@ export default class IndexRoute extends Route { ...@@ -19,4 +19,5 @@ export default class IndexRoute extends Route {
that.replaceWith("authenticated.nodes", home_folder.id); that.replaceWith("authenticated.nodes", home_folder.id);
}); });
} }
} }
...@@ -34,7 +34,8 @@ export default class FolderRoute extends Route { ...@@ -34,7 +34,8 @@ export default class FolderRoute extends Route {
} }
setupController(controller, model) { setupController(controller, model) {
let _controller = this.controllerFor('authenticated.nodes'); let _controller = this.controllerFor('authenticated.nodes'),
_auth_controller = this.controllerFor('authenticated');
if (model.extranode) { if (model.extranode) {
_controller.set('dualpanel_mode', true); _controller.set('dualpanel_mode', true);
...@@ -45,6 +46,6 @@ export default class FolderRoute extends Route { ...@@ -45,6 +46,6 @@ export default class FolderRoute extends Route {
} }
_controller.set('mainnode', model.node); _controller.set('mainnode', model.node);
_controller.set('home_folder', model.home_folder); _auth_controller.set('home_folder', model.home_folder);
} }
} }
import Route from '@ember/routing/route'; import BaseRoute from 'papermerge/base/routing';
import { inject as service } from '@ember/service'; import { inject as service } from '@ember/service';
export default class RolesRoute extends Route {
@service store;
@service session;
beforeModel(transition) { export default class RolesRoute extends BaseRoute {
this.session.requireAuthentication(transition, 'login'); @service store;
}
async model() { async model() {
return this.store.findAll('role'); return this.store.findAll('role');
......
<main> <main>
<Nav::Sidebar @home_folder={{@model}} /> <Nav::Sidebar @home_folder={{this.home_folder}} />
<div class="w-100 central-bar"> <div class="w-100 central-bar">
<Nav::Topbar /> <Nav::Topbar />
<div class="container-fluid mx-2 my-1"> <div class="container-fluid mx-2 my-1">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment