Skip to content

Commit 8e63504

Browse files
committed
Merge branch 'master' into cookie-refactor
# Conflicts: # Build/CommonAssemblyInfo.cs # Griddly.Mvc/Results/QueryableResult.cs
2 parents 6f812b4 + 34ccb16 commit 8e63504

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Griddly.Mvc/Results/QueryableResult.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ public override IList<T> GetPage(int pageNumber, int pageSize, SortField[] sortF
5252
if (_massage != null)
5353
sortedQuery = _massage(sortedQuery);
5454

55-
return sortedQuery.Skip(pageNumber * pageSize).Take(pageSize).ToList();
55+
if (pageNumber != 0)
56+
sortedQuery = sortedQuery.Skip(pageNumber * pageSize);
57+
58+
return sortedQuery.Take(pageSize).ToList();
5659
}
5760

5861
public override void PopulateSummaryValues(GriddlySettings<T> settings)

0 commit comments

Comments
 (0)