From 5e4b6992ab818238758a9919f4c5a288398861b6 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 8 Mar 2018 14:08:29 +0100
Subject: Fix jobs sorting

---
 client/src/app/+admin/jobs/jobs-list/jobs-list.component.html | 2 +-
 client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts   | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'client')

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 @@
 
 <p-table
   [value]="jobs" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" dataKey="id"
-  sortField="createdAt" (onLazyLoad)="loadLazy($event)"
+  [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)"
 >
   <ng-template pTemplate="header">
     <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 {
   rowsPerPage = 10
   sort: SortMeta = { field: 'createdAt', order: -1 }
   pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
-  scrollHeight = ''
 
   constructor (
     private notificationsService: NotificationsService,
@@ -34,9 +33,6 @@ export class JobsListComponent extends RestTable implements OnInit {
   }
 
   ngOnInit () {
-    // 380 -> headers + footer...
-    this.scrollHeight = (viewportHeight() - 380) + 'px'
-
     this.loadJobState()
     this.loadSort()
   }
-- 
cgit v1.2.3