Author: krasnov
Date: 2006-03-12 12:01:29 -0500 (Sun, 12 Mar 2006)
New Revision: 57872
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
Log:
* DataGrid.cs: in AddColumnsFromSource method fixed columns from properties of
custom class
fixed InitializeNumericPager, pager numbers should be a Label control
fixed CreateControlHierarchy, corrected dataset index of items if paging is
enabled
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-03-12 16:41:22 UTC (rev 57871)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-03-12 17:01:29 UTC (rev 57872)
@@ -1,3 +1,11 @@
+2006-03-12 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * DataGrid.cs: in AddColumnsFromSource method fixed columns from
+ properties of custom class
+ fixed InitializeNumericPager, pager numbers should be a Label control
+ fixed CreateControlHierarchy, corrected dataset index of items if
+ paging is enabled
+
2006-03-09 Vladimir Krasnov <[EMAIL PROTECTED]>
* DataList.cs: fixed DoItemInLoop method that fixes itemIndex
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
2006-03-12 16:41:22 UTC (rev 57871)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
2006-03-12 17:01:29 UTC (rev 57872)
@@ -515,7 +515,7 @@
IEnumerator items = (data_source.DataSource !=
null) ? data_source.GetEnumerator () : null;
if (items != null && items.MoveNext ()) {
object data = items.Current;
- if (data is ICustomTypeDescriptor)
+ if ((data is ICustomTypeDescriptor) ||
(!IsBindableType(data.GetType())))
props =
TypeDescriptor.GetProperties (data);
else if (data != null)
ptype = data.GetType ();
@@ -755,7 +755,9 @@
link.CausesValidation = false;
number = link;
} else {
- number = new LiteralControl (page);
+ Label pageLabel = new Label();
+ pageLabel.Text = page;
+ number = pageLabel;
}
res.Controls.Add (number);
@@ -975,6 +977,7 @@
int index = 0;
bool first = true;
string key = null;
+ int dataset_index = pds.FirstIndexInPage;
int selected_index = SelectedIndex;
int edit_item_index = EditItemIndex;
while (enumerator != null && (skip_first ||
enumerator.MoveNext ())) {
@@ -1002,8 +1005,9 @@
else if (index % 2 != 0)
type = ListItemType.AlternatingItem;
- items_list.Add (CreateItem (index, index, type,
useDataSource, data, pds));
+ items_list.Add (CreateItem (index,
dataset_index, type, useDataSource, data, pds));
index++;
+ dataset_index++;
}
CreateItem (-1, -1, ListItemType.Footer, useDataSource,
null, paged_data_source);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches