Author: krasnov
Date: 2007-01-16 04:06:45 -0500 (Tue, 16 Jan 2007)
New Revision: 71112
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
Log:
merge -r 71109:71111
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-01-16 09:02:33 UTC (rev 71111)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-01-16 09:06:45 UTC (rev 71112)
@@ -1,3 +1,8 @@
+2007-01-15 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * DetailsView.cs: fixed CreateChildControls, PageIndex should be less
+ or equal to PageCount
+
2007-01-15 Igor Zelmanovich <[EMAIL PROTECTED]>
* Menu.cs: added z-index attribute to popup div's.
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
2007-01-16 09:02:33 UTC (rev 71111)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
2007-01-16 09:06:45 UTC (rev 71112)
@@ -1102,6 +1102,11 @@
}
}
+ if (AllowPaging && PageIndex >= PageCount) {
+ PageIndex = PageCount - 1;
+ dataSource.CurrentPageIndex = PageIndex;
+ }
+
bool showPager = AllowPaging && (PageCount > 1);
Controls.Clear ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches