zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed and closed #495 : If the number of pages is equal to (pageCount-1)*pageSize the last page is not displayed.

Browse source
This commit is contained in:
Matteo Tomasini 2010-03-25 15:45:54 +00:00
parent 9696e38c32
commit 3f999db114
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.2.513")] [assembly: AssemblyVersion("3.0.2.514")]
[assembly: AssemblyFileVersion("3.0.2.513")] [assembly: AssemblyFileVersion("3.0.2.514")]

1
WebApplication/AllPages.aspx.cs
View file

@ -47,6 +47,7 @@ namespace ScrewTurn.Wiki {
currentPages = GetAllPages(); currentPages = GetAllPages();
pageSelector.ItemCount = currentPages.Count; pageSelector.ItemCount = currentPages.Count;
pageSelector.PageSize = PageSize;
string p = Request["Page"]; string p = Request["Page"];
if(!int.TryParse(p, out selectedPage)) selectedPage = 0; if(!int.TryParse(p, out selectedPage)) selectedPage = 0;

4
WebApplication/PageSelector.ascx.cs
View file

@ -113,7 +113,9 @@ namespace ScrewTurn.Wiki {
for(int i = 0; i < pageCount - 1; i++) { for(int i = 0; i < pageCount - 1; i++) {
result.Add(new ItemBlockRow(i, i * pageSize, pageSize, selectedPage == i)); result.Add(new ItemBlockRow(i, i * pageSize, pageSize, selectedPage == i));
} }
result.Add(new ItemBlockRow(pageCount - 1, (pageCount - 1) * pageSize, lastPageSize, selectedPage == pageCount - 1)); if(itemCount > (pageCount - 1) * pageSize) {
result.Add(new ItemBlockRow(pageCount - 1, (pageCount - 1) * pageSize, lastPageSize, selectedPage == pageCount - 1));
}
// Don't display anything if there is only one page // Don't display anything if there is only one page
if(result.Count > 1) { if(result.Count > 1) {