From 3610f6fdb6ac3428aa2c769760262917bb6f0531 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Mon, 30 Sep 2019 13:52:08 +0100
Subject: [PATCH] FIX #10815 TIME 0:20 sort didn't work after angular 8
migration
---
.../administration/action/actions-administration.component.ts | 2 +-
.../administration/basket/basket-administration.component.ts | 2 +-
.../administration/basket/baskets-administration.component.ts | 2 +-
.../contact/contacts-groups-administration.component.ts | 2 +-
.../diffusionModels-administration.component.ts | 2 +-
.../docserver/docserver-administration.component.ts | 2 +-
.../docserver/docservers-administration.component.ts | 2 +-
.../doctype/doctypes-administration.component.ts | 2 +-
.../administration/group/groups-administration.component.ts | 2 +-
.../history/history-administration.component.ts | 4 ++--
.../indexingModel/indexing-models-administration.component.ts | 2 +-
.../notification/notifications-administration.component.ts | 2 +-
.../parameter/parameters-administration.component.ts | 2 +-
.../priority/priorities-administration.component.ts | 2 +-
.../shipping/shippings-administration.component.ts | 2 +-
.../status/statuses-administration.component.ts | 2 +-
.../template/templates-administration.component.ts | 2 +-
.../app/administration/user/user-administration.component.ts | 2 +-
.../app/administration/user/users-administration.component.ts | 2 +-
19 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/frontend/app/administration/action/actions-administration.component.ts b/src/frontend/app/administration/action/actions-administration.component.ts
index 7593000a100..949bb7d1db1 100755
--- a/src/frontend/app/administration/action/actions-administration.component.ts
+++ b/src/frontend/app/administration/action/actions-administration.component.ts
@@ -32,7 +32,7 @@ export class ActionsAdministrationComponent implements OnInit {
displayedColumns = ['id', 'label_action', 'history', 'actions'];
dataSource = new MatTableDataSource(this.actions);
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
diff --git a/src/frontend/app/administration/basket/basket-administration.component.ts b/src/frontend/app/administration/basket/basket-administration.component.ts
index db1223ce52b..0dbff80e425 100755
--- a/src/frontend/app/administration/basket/basket-administration.component.ts
+++ b/src/frontend/app/administration/basket/basket-administration.component.ts
@@ -52,7 +52,7 @@ export class BasketAdministrationComponent implements OnInit {
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim();
filterValue = filterValue.toLowerCase();
diff --git a/src/frontend/app/administration/basket/baskets-administration.component.ts b/src/frontend/app/administration/basket/baskets-administration.component.ts
index 718e3e22d2e..ba6c8710d37 100755
--- a/src/frontend/app/administration/basket/baskets-administration.component.ts
+++ b/src/frontend/app/administration/basket/baskets-administration.component.ts
@@ -30,7 +30,7 @@ export class BasketsAdministrationComponent implements OnInit {
dataSource : any;
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
diff --git a/src/frontend/app/administration/contact/contacts-groups-administration.component.ts b/src/frontend/app/administration/contact/contacts-groups-administration.component.ts
index 02fdeb42d68..7a8282b6afe 100755
--- a/src/frontend/app/administration/contact/contacts-groups-administration.component.ts
+++ b/src/frontend/app/administration/contact/contacts-groups-administration.component.ts
@@ -32,7 +32,7 @@ export class ContactsGroupsAdministrationComponent implements OnInit {
displayedColumns = ['label', 'description', 'nbContacts', 'public', 'owner', 'actions',];
dataSource = new MatTableDataSource(this.contactsGroups);
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
diff --git a/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.ts b/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.ts
index 52425a8a5a5..1f8346949ba 100755
--- a/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.ts
+++ b/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.ts
@@ -35,7 +35,7 @@ export class DiffusionModelsAdministrationComponent implements OnInit {
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim();
filterValue = filterValue.toLowerCase();
diff --git a/src/frontend/app/administration/docserver/docserver-administration.component.ts b/src/frontend/app/administration/docserver/docserver-administration.component.ts
index c7e5e182530..47ba93fea25 100755
--- a/src/frontend/app/administration/docserver/docserver-administration.component.ts
+++ b/src/frontend/app/administration/docserver/docserver-administration.component.ts
@@ -29,7 +29,7 @@ export class DocserverAdministrationComponent implements OnInit {
docserversTypes : any = [];
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
constructor(
public http: HttpClient,
diff --git a/src/frontend/app/administration/docserver/docservers-administration.component.ts b/src/frontend/app/administration/docserver/docservers-administration.component.ts
index 294c2ad0b99..f38b3dbc6af 100755
--- a/src/frontend/app/administration/docserver/docservers-administration.component.ts
+++ b/src/frontend/app/administration/docserver/docservers-administration.component.ts
@@ -29,7 +29,7 @@ export class DocserversAdministrationComponent implements OnInit {
docserversTypes : any = {};
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
constructor(
public http: HttpClient,
diff --git a/src/frontend/app/administration/doctype/doctypes-administration.component.ts b/src/frontend/app/administration/doctype/doctypes-administration.component.ts
index a13fdca6792..a57a8b1c2c7 100755
--- a/src/frontend/app/administration/doctype/doctypes-administration.component.ts
+++ b/src/frontend/app/administration/doctype/doctypes-administration.component.ts
@@ -45,7 +45,7 @@ export class DoctypesAdministrationComponent implements OnInit {
displayedColumns = ['label','use', 'mandatory', 'column'];
dataSource = new MatTableDataSource(this.currentType.indexes);
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
constructor(
public http: HttpClient,
diff --git a/src/frontend/app/administration/group/groups-administration.component.ts b/src/frontend/app/administration/group/groups-administration.component.ts
index 4facc9a5aed..8f72079595d 100755
--- a/src/frontend/app/administration/group/groups-administration.component.ts
+++ b/src/frontend/app/administration/group/groups-administration.component.ts
@@ -36,7 +36,7 @@ export class GroupsAdministrationComponent implements OnInit {
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim();
filterValue = filterValue.toLowerCase();
diff --git a/src/frontend/app/administration/history/history-administration.component.ts b/src/frontend/app/administration/history/history-administration.component.ts
index 21157f741ca..4a656d05dcb 100755
--- a/src/frontend/app/administration/history/history-administration.component.ts
+++ b/src/frontend/app/administration/history/history-administration.component.ts
@@ -43,8 +43,8 @@ export class HistoryAdministrationComponent implements OnInit {
@ViewChild('paginator', { static: false }) paginator: MatPaginator;
@ViewChild('batchPaginator', { static: false }) batchPaginator: MatPaginator;
- @ViewChild('sort', { static: true }) sort: MatSort;
- @ViewChild('batchSort', { static: true }) batchSort: MatSort;
+ @ViewChild('sort', { static: false }) sort: MatSort;
+ @ViewChild('batchSort', { static: false }) batchSort: MatSort;
applyFilter(filterValue: string, historyType : string) {
filterValue = filterValue.trim();
filterValue = filterValue.toLowerCase();
diff --git a/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts b/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts
index c5928e931de..2d461457bd7 100644
--- a/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts
+++ b/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts
@@ -38,7 +38,7 @@ export class IndexingModelsAdministrationComponent implements OnInit {
dataSource = new MatTableDataSource(this.indexingModels);
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
dialogRef: MatDialogRef<any>;
diff --git a/src/frontend/app/administration/notification/notifications-administration.component.ts b/src/frontend/app/administration/notification/notifications-administration.component.ts
index b5f68c161d6..d2e47942a04 100755
--- a/src/frontend/app/administration/notification/notifications-administration.component.ts
+++ b/src/frontend/app/administration/notification/notifications-administration.component.ts
@@ -48,7 +48,7 @@ export class NotificationsAdministrationComponent implements OnInit {
displayedColumns = ['notification_id', 'description', 'is_enabled', 'notifications'];
dataSource = new MatTableDataSource(this.notifications);
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
diff --git a/src/frontend/app/administration/parameter/parameters-administration.component.ts b/src/frontend/app/administration/parameter/parameters-administration.component.ts
index 899227f7841..6b40c27b73f 100755
--- a/src/frontend/app/administration/parameter/parameters-administration.component.ts
+++ b/src/frontend/app/administration/parameter/parameters-administration.component.ts
@@ -29,7 +29,7 @@ export class ParametersAdministrationComponent implements OnInit {
displayedColumns = ['id', 'description', 'value', 'actions'];
dataSource: any;
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
constructor(
diff --git a/src/frontend/app/administration/priority/priorities-administration.component.ts b/src/frontend/app/administration/priority/priorities-administration.component.ts
index efe92d84a57..441c8da95fc 100755
--- a/src/frontend/app/administration/priority/priorities-administration.component.ts
+++ b/src/frontend/app/administration/priority/priorities-administration.component.ts
@@ -30,7 +30,7 @@ export class PrioritiesAdministrationComponent implements OnInit {
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
diff --git a/src/frontend/app/administration/shipping/shippings-administration.component.ts b/src/frontend/app/administration/shipping/shippings-administration.component.ts
index 338c3868323..a8bd9c518fa 100644
--- a/src/frontend/app/administration/shipping/shippings-administration.component.ts
+++ b/src/frontend/app/administration/shipping/shippings-administration.component.ts
@@ -29,7 +29,7 @@ export class ShippingsAdministrationComponent implements OnInit {
displayedColumns = ['label', 'description', 'accountid', 'actions'];
dataSource: any;
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
constructor(
diff --git a/src/frontend/app/administration/status/statuses-administration.component.ts b/src/frontend/app/administration/status/statuses-administration.component.ts
index 6ada52e85fb..bba18fa8e3b 100755
--- a/src/frontend/app/administration/status/statuses-administration.component.ts
+++ b/src/frontend/app/administration/status/statuses-administration.component.ts
@@ -29,7 +29,7 @@ export class StatusesAdministrationComponent implements OnInit {
dataSource = new MatTableDataSource(this.statuses);
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
diff --git a/src/frontend/app/administration/template/templates-administration.component.ts b/src/frontend/app/administration/template/templates-administration.component.ts
index 4e387b520ba..84994f99526 100755
--- a/src/frontend/app/administration/template/templates-administration.component.ts
+++ b/src/frontend/app/administration/template/templates-administration.component.ts
@@ -32,7 +32,7 @@ export class TemplatesAdministrationComponent implements OnInit {
displayedColumns = ['template_label', 'template_comment', 'template_type', 'template_target', 'actions'];
dataSource = new MatTableDataSource(this.templates);
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
diff --git a/src/frontend/app/administration/user/user-administration.component.ts b/src/frontend/app/administration/user/user-administration.component.ts
index f10ecdd45a8..ea03dfecd39 100755
--- a/src/frontend/app/administration/user/user-administration.component.ts
+++ b/src/frontend/app/administration/user/user-administration.component.ts
@@ -84,7 +84,7 @@ export class UserAdministrationComponent implements OnInit {
maarchParapheurConnectionStatus = true;
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim();
filterValue = filterValue.toLowerCase();
diff --git a/src/frontend/app/administration/user/users-administration.component.ts b/src/frontend/app/administration/user/users-administration.component.ts
index 97dc22ef3a6..cf86a61e34d 100755
--- a/src/frontend/app/administration/user/users-administration.component.ts
+++ b/src/frontend/app/administration/user/users-administration.component.ts
@@ -44,7 +44,7 @@ export class UsersAdministrationComponent implements OnInit {
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
- @ViewChild(MatSort, { static: true }) sort: MatSort;
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
--
GitLab