diff --git a/Demo/JSLib/Query/QueryController.ts b/Demo/JSLib/Query/QueryController.ts index a7d6062..9099f46 100644 --- a/Demo/JSLib/Query/QueryController.ts +++ b/Demo/JSLib/Query/QueryController.ts @@ -238,8 +238,15 @@ try { var totalCount = xhr.getResponseHeader("X-Total-Count"); - if (totalCount) { - this._studyPagerModel.setLinkHeader(xhr.getResponseHeader("link"), data.length, parseInt(totalCount, 10)); + var linkHeader = xhr.getResponseHeader("link"); + + if (linkHeader) { + if (!totalCount) + { + totalCount = "-1"; + } + + this._studyPagerModel.setLinkHeader(linkHeader, data.length, parseInt(totalCount, 10)); this._studyPagerModel.currentOffset = offset; this._studyPagerView.render(); this._studyPagerView.show(); diff --git a/Demo/JSLib/Query/QueryPagerView.js.map b/Demo/JSLib/Query/QueryPagerView.js.map index 0762512..43d2f00 100644 --- a/Demo/JSLib/Query/QueryPagerView.js.map +++ b/Demo/JSLib/Query/QueryPagerView.js.map @@ -1 +1 @@ -{"version":3,"file":"QueryPagerView.js","sourceRoot":"","sources":["QueryPagerView.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"QueryPagerView.js","sourceRoot":"","sources":["QueryPagerView.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Demo/JSLib/Query/QueryPagerView.ts b/Demo/JSLib/Query/QueryPagerView.ts index 4b020cb..e277688 100644 --- a/Demo/JSLib/Query/QueryPagerView.ts +++ b/Demo/JSLib/Query/QueryPagerView.ts @@ -66,13 +66,20 @@ class QueryPagerView this._$last.removeClass("disabled"); } - this._$pageInfo.text("Page: " + this.model.currentPage + "/" + this.model.pageCount); + if (this.model.pageCount >= this.model.currentPage) { + this._$pageInfo.text("Page: " + this.model.currentPage + "/" + this.model.pageCount); + } + else + { + this._$pageInfo.text("Page: " + this.model.currentPage); + } } public show() { this._$element.show(); } + public hide() { this._$element.hide(); } diff --git a/Demo/Views/Demo/_AlertDlg.cshtml b/Demo/Views/Demo/_AlertDlg.cshtml index a77e7ba..60c4a38 100644 --- a/Demo/Views/Demo/_AlertDlg.cshtml +++ b/Demo/Views/Demo/_AlertDlg.cshtml @@ -7,7 +7,7 @@
-
+