Skip to content

Commit 9cee14b

Browse files
authored
Wrong breadcrumb path (ciur/papermerge#509)
1 parent 0aaeb75 commit 9cee14b

File tree

6 files changed

+16
-18
lines changed

6 files changed

+16
-18
lines changed

app/components/breadcrumb/index.js

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,7 @@ import Component from '@glimmer/component';
44
export default class BreadcrumbComponent extends Component {
55

66
get nodes() {
7-
let current,
8-
_nodes = [];
9-
10-
current = this.args.node;
11-
12-
while (current && current.get('id')) {
13-
_nodes.push(current);
14-
current = current.get('parent');
15-
}
16-
17-
return _nodes.reverse();
7+
return this.args.node.breadcrumb;
188
}
199

2010
get query() {

app/components/breadcrumb/item.hbs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<li class="breadcrumb-item">
2-
{{#if (is_equal @node.title ".inbox")}}
2+
{{#if (is_equal @node.[0] ".inbox")}}
33
{{#if this.show_spinner}}
44
<Spinner @inProgress={{true}} class="text-primary" />
55
{{else}}
66
<Spinner @inProgress={{false}} class="text-primary" />
77
{{/if}}
88
<Breadcrumb::Inbox />
9-
{{else if (is_equal @node.title ".home")}}
9+
{{else if (is_equal @node.[0] ".home")}}
1010
{{#if this.show_spinner}}
1111
<Spinner @inProgress={{true}} class="text-primary" />
1212
{{else}}
@@ -17,14 +17,14 @@
1717

1818
<button
1919
class="btn btn-link"
20-
{{on "click" (perform @onNodeClicked @node.id @hint 'folder')}}
21-
{{tooltip title=@node.id placement='bottom' delay=4000}}>
22-
{{#if (is_equal @node.title ".inbox")}}
20+
{{on "click" (perform @onNodeClicked @node.[1] @hint 'folder')}}
21+
{{tooltip title=@node.[1] placement='bottom' delay=4000}}>
22+
{{#if (is_equal @node.[0] ".inbox")}}
2323
Inbox
24-
{{else if (is_equal @node.title ".home")}}
24+
{{else if (is_equal @node.[0] ".home")}}
2525
Home
2626
{{else}}
27-
{{@node.title}}
27+
{{@node.[0]}}
2828
{{/if}}
2929
</button>
3030
</li>

app/models/document.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default class DocumentModel extends NodeModel {
66
@attr image;
77
@attr lang;
88
@attr ocr;
9+
@attr breadcrumb;
910
@attr ocr_status;
1011
// `versions` is an Array of DocumentVersion(s)
1112
@attr versions; // of type DocumentVersion

app/models/folder.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
import { attr } from '@ember-data/model';
2+
13
import NodeModel from './node';
24

35

46
export default class FolderModel extends NodeModel {
57

8+
@attr breadcrumb;
9+
610
get nodeType() {
711
return 'folder';
812
}

app/models/node.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ export default class NodeModel extends Model {
44
@attr title;
55
@attr tags;
66
@attr model;
7+
@attr breadcrumb;
8+
79
@belongsTo('node',
810
{
911
async: true,

changelog.d/509.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Wrong breadcrumb path when openening document/folder

0 commit comments

Comments
 (0)