diff --git a/src/frontend/app/folder/folder-tree.component.html b/src/frontend/app/folder/folder-tree.component.html index 3d073b208f58ace4e3a753dab83566d8096d3643..b093393c8ef4f40479892daf0e7e5cd954a74ebe 100644 --- a/src/frontend/app/folder/folder-tree.component.html +++ b/src/frontend/app/folder/folder-tree.component.html @@ -17,7 +17,7 @@ [disabled]="!node.showAction"> <mat-icon *ngIf="node.showAction" class="folderAction fa fa-ellipsis-v"></mat-icon> <span *ngIf="!node.showAction"> - {{node.countRes}} + {{node.countResources}} </span> </button> <mat-menu #menu="matMenu"> @@ -55,7 +55,7 @@ <button mat-icon-button [matMenuTriggerFor]="menu" (click)="$event.stopPropagation();" [disabled]="!node.showAction"> <mat-icon *ngIf="node.showAction" class="folderAction fa fa-ellipsis-v"></mat-icon> <span *ngIf="!node.showAction"> - {{node.countRes}} + {{node.countResources}} </span> </button> <mat-menu #menu="matMenu"> diff --git a/src/frontend/app/folder/folder-tree.component.scss b/src/frontend/app/folder/folder-tree.component.scss index 852ef3b3eef64d85a44d2a819256dec28b114de1..6bb870f9bede8da77954b2334dcb0cc470525727 100644 --- a/src/frontend/app/folder/folder-tree.component.scss +++ b/src/frontend/app/folder/folder-tree.component.scss @@ -75,7 +75,7 @@ form { } .drag { - color: $secondary; + color: $secondary !important; } .more { diff --git a/src/frontend/app/folder/folder-tree.component.ts b/src/frontend/app/folder/folder-tree.component.ts index b9461d25fb3e09c4faa5184aac9aabd2ca23893e..8af86178c880cf52262c7bb64d334a685622a737 100644 --- a/src/frontend/app/folder/folder-tree.component.ts +++ b/src/frontend/app/folder/folder-tree.component.ts @@ -20,7 +20,7 @@ export class ItemNode { label: string; parent_id: number; public: boolean; - countRes: number; + countResources: number; } /** Flat to-do item node with expandable and level information */ @@ -28,7 +28,7 @@ export class ItemFlatNode { id: number; label: string; parent_id: number; - countRes: number; + countResources: number; level: number; public: boolean; expandable: boolean; @@ -82,7 +82,7 @@ export class FolderTreeComponent implements OnInit { ? existingNode : new ItemFlatNode(); flatNode.label = node.label; - flatNode.countRes = node.countRes; + flatNode.countResources = node.countResources; flatNode.public = node.public; flatNode.parent_id = node.parent_id; flatNode.id = node.id; @@ -327,7 +327,7 @@ export class FolderTreeComponent implements OnInit { filter((data: string) => data === 'ok'), //exhaustMap(() => this.http.post("../../rest/folders/" + node.id)), tap(() => { - node.countRes = node.countRes + 1; + node.countResources = node.countResources + 1; }), tap(() => this.notify.success('Courrier classé')), finalize(() => node.drag = false),