|
|
@@ -1905,15 +1905,13 @@
|
|
|
},
|
|
|
request;
|
|
|
|
|
|
- if(this.options.pagination) {
|
|
|
+ if (this.options.pagination) {
|
|
|
params.pageSize = this.options.pageSize === this.options.formatAllRows() ?
|
|
|
this.options.totalRows : this.options.pageSize;
|
|
|
params.pageNumber = this.options.pageNumber;
|
|
|
- } else {
|
|
|
- params.pageSize = this.options.totalRows;
|
|
|
}
|
|
|
|
|
|
- if (!this.options.url && !this.options.ajax) {
|
|
|
+ if (!(url || this.options.url) && !this.options.ajax) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -1923,14 +1921,12 @@
|
|
|
sort: params.sortName,
|
|
|
order: params.sortOrder
|
|
|
};
|
|
|
- params.offset = this.options.pageSize === this.options.formatAllRows() ?
|
|
|
- 0 : this.options.pageSize * (this.options.pageNumber - 1);
|
|
|
|
|
|
if (this.options.pagination) {
|
|
|
+ params.offset = this.options.pageSize === this.options.formatAllRows() ?
|
|
|
+ 0 : this.options.pageSize * (this.options.pageNumber - 1);
|
|
|
params.limit = this.options.pageSize === this.options.formatAllRows() ?
|
|
|
this.options.totalRows : this.options.pageSize;
|
|
|
- } else {
|
|
|
- params.limit = this.options.totalRows;
|
|
|
}
|
|
|
}
|
|
|
|