From 4c3304485d0fe4a6550088ebff884998655305f8 Mon Sep 17 00:00:00 2001
From: Eugen Ciur <eugen@papermerge.com>
Date: Mon, 1 Nov 2021 20:12:49 +0100
Subject: [PATCH] show folder titles as links
---
app/adapters/node.js | 3 +--
app/components/folder.hbs | 5 ++++-
app/router.js | 1 -
app/routes/application.js | 16 +---------------
app/services/current-user.js | 1 +
5 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/app/adapters/node.js b/app/adapters/node.js
index 0464c21..23fbe9a 100644
--- a/app/adapters/node.js
+++ b/app/adapters/node.js
@@ -3,14 +3,13 @@ import ApplicationAdapter from './application';
export default class NodeAdapter extends ApplicationAdapter {
findNode(node_id) {
- let url, ret, json;
+ let url, ret, json, query;
url = this.buildURL('nodes', node_id);
return this.ajax(url, 'GET').then((node) => {
this.store.pushPayload('folder', node);
ret = this.store.peekRecord('folder', node.data.id);
- console.log(node.data);
return ret;
});
diff --git a/app/components/folder.hbs b/app/components/folder.hbs
index d711d74..ed43bb6 100644
--- a/app/components/folder.hbs
+++ b/app/components/folder.hbs
@@ -1,6 +1,9 @@
<div class="node folder">
<div class="icon folder"></div>
<div class="title">
- {{@model.title}}
+ <LinkTo
+ @route="authenticated.nodes" @model={{@model}}>
+ {{@model.title}}
+ </LinkTo>
</div>
</div>
\ No newline at end of file
diff --git a/app/router.js b/app/router.js
index b46490e..014e172 100644
--- a/app/router.js
+++ b/app/router.js
@@ -13,7 +13,6 @@ Router.map(function () {
this.route('document', { path: '/document/:document_id' });
this.route('nodes', { path: '/nodes/:node_id' });
- this.route('nodes', { path: '/nodes/' });
this.route('tags');
diff --git a/app/routes/application.js b/app/routes/application.js
index 6768ea9..56b9f8f 100644
--- a/app/routes/application.js
+++ b/app/routes/application.js
@@ -1,19 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-export default class ApplicationRoute extends Route {
- @service session;
- @service currentUser;
-
- beforeModel() {
- return this._loadCurrentUser();
- }
- async _loadCurrentUser() {
- try {
- await this.currentUser.loadCurrentUser();
- } catch (err) {
- await this.session.invalidate();
- }
- }
+export default class ApplicationRoute extends Route {
}
diff --git a/app/services/current-user.js b/app/services/current-user.js
index e805e33..16bbbdf 100644
--- a/app/services/current-user.js
+++ b/app/services/current-user.js
@@ -1,6 +1,7 @@
import Service from '@ember/service';
import { inject as service } from '@ember/service';
+
export default class CurrentUserService extends Service {
@service session;
@service store;
--
GitLab