Fix WebSPA pager display (#1629)

n-stefan · web-flow · commit 68f5afd09c9a · 2021-03-15T12:22:46.000+05:30
diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts b/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts
@@ -95,7 +95,7 @@ export class CatalogComponent implements OnInit {
                     itemsPage : catalog.pageSize,
                     totalItems : catalog.count,
                     totalPages: Math.ceil(catalog.count / catalog.pageSize),
-                    items: catalog.pageSize
+                    items: catalog.data.length
                 };
         });
     }
diff --git a/src/Web/WebSPA/Client/modules/shared/components/pager/pager.ts b/src/Web/WebSPA/Client/modules/shared/components/pager/pager.ts
@@ -25,8 +25,6 @@ export class Pager implements OnInit, OnChanges  {
 
     ngOnChanges() {
         if (this.model) {
-            this.model.items = (this.model.itemsPage > this.model.totalItems) ? this.model.totalItems : this.model.itemsPage;
-
             this.buttonStates.previousDisabled = (this.model.actualPage == 0);
             this.buttonStates.nextDisabled = (this.model.actualPage + 1 >= this.model.totalPages);
         }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ export class CatalogComponent implements OnInit {`
`95`	`95`	`itemsPage : catalog.pageSize,`
`96`	`96`	`totalItems : catalog.count,`
`97`	`97`	`totalPages: Math.ceil(catalog.count / catalog.pageSize),`
`98`		`- items: catalog.pageSize`
	`98`	`+ items: catalog.data.length`
`99`	`99`	`};`
`100`	`100`	`});`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ export class Pager implements OnInit, OnChanges {`
`25`	`25`
`26`	`26`	`ngOnChanges() {`
`27`	`27`	`if (this.model) {`
`28`		`- this.model.items = (this.model.itemsPage > this.model.totalItems) ? this.model.totalItems : this.model.itemsPage;`
`29`		`-`
`30`	`28`	`this.buttonStates.previousDisabled = (this.model.actualPage == 0);`
`31`	`29`	`this.buttonStates.nextDisabled = (this.model.actualPage + 1 >= this.model.totalPages);`
`32`	`30`	`}`