From fe48d53fc0ecc7dcd4753ac8b9f56f82fd0b8b06 Mon Sep 17 00:00:00 2001 From: Eugen Ciur <eugen@papermerge.com> Date: Sun, 14 Nov 2021 08:54:08 +0100 Subject: [PATCH] link_to left link to right --- app/components/breadcrumb/index.hbs | 12 ++++++++---- app/components/commander/index.hbs | 4 ++-- .../{document.hbs => document/index.hbs} | 0 app/components/{document.js => document/index.js} | 2 +- app/components/document/link_to_left.hbs | 14 ++++++++++++++ app/components/{folder.hbs => folder/index.hbs} | 0 app/components/{folder.js => folder/index.js} | 2 +- .../{commander => folder}/link_to_left.hbs | 0 .../{commander => folder}/link_to_right.hbs | 0 9 files changed, 26 insertions(+), 8 deletions(-) rename app/components/{document.hbs => document/index.hbs} (100%) rename app/components/{document.js => document/index.js} (64%) create mode 100644 app/components/document/link_to_left.hbs rename app/components/{folder.hbs => folder/index.hbs} (100%) rename app/components/{folder.js => folder/index.js} (87%) rename app/components/{commander => folder}/link_to_left.hbs (100%) rename app/components/{commander => folder}/link_to_right.hbs (100%) diff --git a/app/components/breadcrumb/index.hbs b/app/components/breadcrumb/index.hbs index cf38257..f57949e 100644 --- a/app/components/breadcrumb/index.hbs +++ b/app/components/breadcrumb/index.hbs @@ -3,11 +3,15 @@ {{#each this.nodes as |node|}} <li class="breadcrumb-item"> {{#if (is_equal @hint "left")}} - <Commander::LinkToLeft - @node={{node}} - @extranode={{@extranode}} /> + {{#if (is_equal node.nodeType "document") }} + <Document::LinkToLeft @node={{node}} /> + {{else}} + <Folder::LinkToLeft + @node={{node}} + @extranode={{@extranode}} /> + {{/if}} {{else}} - <Commander::LinkToRight + <Folder::LinkToRight @node={{@extranode}} @extranode={{node}} /> {{/if}} diff --git a/app/components/commander/index.hbs b/app/components/commander/index.hbs index 8e1a898..aa195fe 100644 --- a/app/components/commander/index.hbs +++ b/app/components/commander/index.hbs @@ -45,11 +45,11 @@ @selectedNodes={{this.selected_nodes}} @onCheckboxChange={{this.onCheckboxChange}} > {{#if (is_equal @hint "left")}} - <Commander::LinkToLeft + <Folder::LinkToLeft @node={{node}} @extranode={{@extranode}} /> {{else}} - <Commander::LinkToRight + <Folder::LinkToRight @node={{@extranode}} @extranode={{node}} /> {{/if}} diff --git a/app/components/document.hbs b/app/components/document/index.hbs similarity index 100% rename from app/components/document.hbs rename to app/components/document/index.hbs diff --git a/app/components/document.js b/app/components/document/index.js similarity index 64% rename from app/components/document.js rename to app/components/document/index.js index c2c1868..8e31ea0 100644 --- a/app/components/document.js +++ b/app/components/document/index.js @@ -1,4 +1,4 @@ -import NodeComponent from "./node"; +import NodeComponent from "../node"; export default class DocumentComponent extends NodeComponent { diff --git a/app/components/document/link_to_left.hbs b/app/components/document/link_to_left.hbs new file mode 100644 index 0000000..b37c748 --- /dev/null +++ b/app/components/document/link_to_left.hbs @@ -0,0 +1,14 @@ +{{#if @extranode}} + <LinkTo + @route="authenticated.nodes" + @model={{@node.id}} + @query={{hash extranode_id=@extranode.id}}> + {{@node.title}} + </LinkTo> +{{else}} + <LinkTo + @route="authenticated.document" + @model={{@node.id}}> + {{@node.title}} + </LinkTo> +{{/if}} \ No newline at end of file diff --git a/app/components/folder.hbs b/app/components/folder/index.hbs similarity index 100% rename from app/components/folder.hbs rename to app/components/folder/index.hbs diff --git a/app/components/folder.js b/app/components/folder/index.js similarity index 87% rename from app/components/folder.js rename to app/components/folder/index.js index 0fd871d..5a641a2 100644 --- a/app/components/folder.js +++ b/app/components/folder/index.js @@ -1,4 +1,4 @@ -import NodeComponent from "./node"; +import NodeComponent from "../node"; export default class FolderComponent extends NodeComponent { diff --git a/app/components/commander/link_to_left.hbs b/app/components/folder/link_to_left.hbs similarity index 100% rename from app/components/commander/link_to_left.hbs rename to app/components/folder/link_to_left.hbs diff --git a/app/components/commander/link_to_right.hbs b/app/components/folder/link_to_right.hbs similarity index 100% rename from app/components/commander/link_to_right.hbs rename to app/components/folder/link_to_right.hbs -- GitLab