Browse Source

refactor(core): set _page variable initial value to 0

resolves #4224
pull/4216/head
mehmet-erim 6 years ago
parent
commit
832cfc64bf
  1. 4
      npm/ng-packs/packages/core/src/lib/services/list.service.ts
  2. 4
      npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
  3. 4
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
  4. 4
      npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html

4
npm/ng-packs/packages/core/src/lib/services/list.service.ts

@ -26,7 +26,7 @@ export class ListService implements OnDestroy {
return this._maxResultCount; return this._maxResultCount;
} }
private _page = 1; private _page = 0;
set page(value: number) { set page(value: number) {
this._page = value; this._page = value;
this.get(); this.get();
@ -71,7 +71,7 @@ export class ListService implements OnDestroy {
this._query$.next({ this._query$.next({
filter: this._filter || undefined, filter: this._filter || undefined,
maxResultCount: this._maxResultCount, maxResultCount: this._maxResultCount,
skipCount: (this._page - 1) * this._maxResultCount, skipCount: this._page * this._maxResultCount,
sorting: this._sortOrder ? `${this._sortKey} ${this._sortOrder}` : undefined, sorting: this._sortOrder ? `${this._sortKey} ${this._sortOrder}` : undefined,
}); });
}; };

4
npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html

@ -27,9 +27,9 @@
(sort)="sort($event)" (sort)="sort($event)"
[externalPaging]="true" [externalPaging]="true"
[count]="totalCount$ | async" [count]="totalCount$ | async"
[offset]="list.page - 1" [offset]="list.page"
[limit]="list.maxResultCount" [limit]="list.maxResultCount"
(page)="list.page = $event.offset + 1" (page)="list.page = $event.offset"
[headerHeight]="50" [headerHeight]="50"
[footerHeight]="50" [footerHeight]="50"
columnMode="force" columnMode="force"

4
npm/ng-packs/packages/identity/src/lib/components/users/users.component.html

@ -37,9 +37,9 @@
(sort)="sort($event)" (sort)="sort($event)"
[externalPaging]="true" [externalPaging]="true"
[count]="totalCount$ | async" [count]="totalCount$ | async"
[offset]="list.page - 1" [offset]="list.page"
[limit]="list.maxResultCount" [limit]="list.maxResultCount"
(page)="list.page = $event.offset + 1" (page)="list.page = $event.offset"
[headerHeight]="50" [headerHeight]="50"
[footerHeight]="50" [footerHeight]="50"
columnMode="force" columnMode="force"

4
npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html

@ -38,9 +38,9 @@
(sort)="sort($event)" (sort)="sort($event)"
[externalPaging]="true" [externalPaging]="true"
[count]="totalCount$ | async" [count]="totalCount$ | async"
[offset]="list.page - 1" [offset]="list.page"
[limit]="list.maxResultCount" [limit]="list.maxResultCount"
(page)="list.page = $event.offset + 1" (page)="list.page = $event.offset"
[headerHeight]="50" [headerHeight]="50"
[footerHeight]="50" [footerHeight]="50"
columnMode="force" columnMode="force"

Loading…
Cancel
Save