From 514252a6ef9e51246806bd9e5efb8cecf24531c4 Mon Sep 17 00:00:00 2001
From: GabrielMeyer <meyergabriel@live.de>
Date: Mon, 3 Jun 2019 16:20:27 +0200
Subject: [PATCH] Hotfix for pagination in motion-list

---
 client/src/app/site/base/list-view-base.ts            | 11 ++++++-----
 .../components/motion-list/motion-list.component.html |  4 ++--
 .../components/motion-list/motion-list.component.ts   |  3 +++
 3 files changed, 11 insertions(+), 7 deletions(-)

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 @@
                 >
                 </mat-row>
             </mat-table>
-
-            <mat-paginator class="on-transition-fade" [pageSizeOptions]="pageSize"></mat-paginator>
         </span>
         <span *ngSwitchCase="'tiles'">
             <os-grid-layout>
@@ -182,6 +180,8 @@
             </os-grid-layout>
         </span>
     </div>
+
+    <mat-paginator [style.display]="selectedView === 'list' ? 'block' : 'none'" class="on-transition-fade" [pageSizeOptions]="pageSize"></mat-paginator>
 </mat-drawer-container>
 
 <mat-menu #motionListMenu="matMenu">
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<ViewMotion, Motio
     public onChangeView(value: string): void {
         this.selectedView = value;
         this.storage.set('motionListView', value);
+        if (value === 'list') {
+            this.initTable();
+        }
     }
 
     /**