diff options
author | Chocobozzz <me@florianbigard.com> | 2018-03-08 14:08:29 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-03-08 14:08:29 +0100 |
commit | 5e4b6992ab818238758a9919f4c5a288398861b6 (patch) | |
tree | 2fad7fff37114ecd65b07ba2cffaaa32b6fb7643 | |
parent | b3eeb529d92dd5eb5563f0e2bb9f08cda8407513 (diff) | |
download | PeerTube-5e4b6992ab818238758a9919f4c5a288398861b6.tar.gz PeerTube-5e4b6992ab818238758a9919f4c5a288398861b6.tar.zst PeerTube-5e4b6992ab818238758a9919f4c5a288398861b6.zip |
Fix jobs sorting
-rw-r--r-- | client/src/app/+admin/jobs/jobs-list/jobs-list.component.html | 2 | ||||
-rw-r--r-- | client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.html b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.html index 1469cf611..2bc8ab3dd 100644 --- a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.html +++ b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.html | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | <p-table | 11 | <p-table |
12 | [value]="jobs" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" dataKey="id" | 12 | [value]="jobs" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" dataKey="id" |
13 | sortField="createdAt" (onLazyLoad)="loadLazy($event)" | 13 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" |
14 | > | 14 | > |
15 | <ng-template pTemplate="header"> | 15 | <ng-template pTemplate="header"> |
16 | <tr> | 16 | <tr> |
diff --git a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts index 80aba9f3a..e3f317e6d 100644 --- a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts +++ b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts | |||
@@ -23,7 +23,6 @@ export class JobsListComponent extends RestTable implements OnInit { | |||
23 | rowsPerPage = 10 | 23 | rowsPerPage = 10 |
24 | sort: SortMeta = { field: 'createdAt', order: -1 } | 24 | sort: SortMeta = { field: 'createdAt', order: -1 } |
25 | pagination: RestPagination = { count: this.rowsPerPage, start: 0 } | 25 | pagination: RestPagination = { count: this.rowsPerPage, start: 0 } |
26 | scrollHeight = '' | ||
27 | 26 | ||
28 | constructor ( | 27 | constructor ( |
29 | private notificationsService: NotificationsService, | 28 | private notificationsService: NotificationsService, |
@@ -34,9 +33,6 @@ export class JobsListComponent extends RestTable implements OnInit { | |||
34 | } | 33 | } |
35 | 34 | ||
36 | ngOnInit () { | 35 | ngOnInit () { |
37 | // 380 -> headers + footer... | ||
38 | this.scrollHeight = (viewportHeight() - 380) + 'px' | ||
39 | |||
40 | this.loadJobState() | 36 | this.loadJobState() |
41 | this.loadSort() | 37 | this.loadSort() |
42 | } | 38 | } |