diff --git a/client/src/app/site/base/list-view-base.ts b/client/src/app/site/base/list-view-base.ts
index 63dd18312..90285d086 100644
--- a/client/src/app/site/base/list-view-base.ts
+++ b/client/src/app/site/base/list-view-base.ts
@@ -124,23 +124,24 @@ export abstract class ListViewBaseComponent<
this.dataSource.paginator._intl.itemsPerPageLabel = this.translate.instant('items per page');
}
- // TODO: Add subscription to this.subscriptions
if (this.modelFilterListService && this.modelSortService) {
// filtering and sorting
this.modelFilterListService.initFilters(this.getModelListObservable());
this.modelSortService.initSorting(this.modelFilterListService.outputObservable);
- this.modelSortService.outputObservable.subscribe(data => this.setDataSource(data));
+ this.subscriptions.push(this.modelSortService.outputObservable.subscribe(data => this.setDataSource(data)));
} else if (this.modelFilterListService) {
// only filter service
this.modelFilterListService.initFilters(this.getModelListObservable());
- this.modelFilterListService.outputObservable.subscribe(data => this.setDataSource(data));
+ this.subscriptions.push(
+ this.modelFilterListService.outputObservable.subscribe(data => this.setDataSource(data))
+ );
} else if (this.modelSortService) {
// only sorting
this.modelSortService.initSorting(this.getModelListObservable());
- this.modelSortService.outputObservable.subscribe(data => this.setDataSource(data));
+ this.subscriptions.push(this.modelSortService.outputObservable.subscribe(data => this.setDataSource(data)));
} else {
// none of both
- this.getModelListObservable().subscribe(data => this.setDataSource(data));
+ this.subscriptions.push(this.getModelListObservable().subscribe(data => this.setDataSource(data)));
}
}
diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
index aee3edb1e..02c8fe674 100644
--- a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
+++ b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
@@ -157,8 +157,6 @@
>
-
-
@@ -182,6 +180,8 @@
+
+
diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts
index af618f9c2..28acab5a4 100644
--- a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts
+++ b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts
@@ -492,6 +492,9 @@ export class MotionListComponent extends ListViewBaseComponent