diff --git a/web/src/app/administration/access-items-management/access-items-management.component.html b/web/src/app/administration/access-items-management/access-items-management.component.html index d5cdc79fd..3063cd638 100644 --- a/web/src/app/administration/access-items-management/access-items-management.component.html +++ b/web/src/app/administration/access-items-management/access-items-management.component.html @@ -1,6 +1,6 @@
-

Acces items management

+

Access items management

@@ -17,7 +17,7 @@ - + Workbasket Key Access Id diff --git a/web/src/app/administration/access-items-management/access-items-management.component.ts b/web/src/app/administration/access-items-management/access-items-management.component.ts index 09f9684ac..9ea4441e5 100644 --- a/web/src/app/administration/access-items-management/access-items-management.component.ts +++ b/web/src/app/administration/access-items-management/access-items-management.component.ts @@ -34,7 +34,8 @@ export class AccessItemsManagementComponent implements OnInit, OnDestroy { accessIdsWithGroups: Array; belongingGroups: Array; sortingFields = new Map([['workbasket-key', 'Workbasket Key'], ['access-id', 'Access id']]); - sortModel: SortingModel; + accessItemDefaultSortBy: string = 'workbasket-key'; + sortModel: SortingModel = new SortingModel(this.accessItemDefaultSortBy); isGroup: boolean; groupsKey = 'ou=groups'; diff --git a/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.html b/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.html index c11d7c537..d959ee10a 100644 --- a/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.html +++ b/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.html @@ -7,7 +7,7 @@
- + diff --git a/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.ts b/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.ts index d75adaa22..8c8730b21 100644 --- a/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.ts +++ b/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import { Task } from 'app/workplace/models/task'; import { Workbasket } from 'app/models/workbasket'; import { TaskService } from 'app/workplace/services/task.service'; @@ -22,11 +22,11 @@ export enum Search { styleUrls: ['./task-list-toolbar.component.scss'] }) export class TaskListToolbarComponent implements OnInit { + @Input() taskDefaultSortBy: string; @Output() performSorting = new EventEmitter(); @Output() performFilter = new EventEmitter(); @Output() selectSearchType = new EventEmitter(); - sortingFields = new Map([['name', 'Name'], ['priority', 'Priority'], ['due', 'Due'], ['planned', 'Planned']]); filterParams = { name: '', key: '', owner: '', priority: '', state: '' }; tasks: Task[] = []; diff --git a/web/src/app/workplace/taskmaster/task-master.component.html b/web/src/app/workplace/taskmaster/task-master.component.html index b2f6964b7..938cb7546 100644 --- a/web/src/app/workplace/taskmaster/task-master.component.html +++ b/web/src/app/workplace/taskmaster/task-master.component.html @@ -1,7 +1,7 @@