Author: krasnov
Date: 2006-02-20 09:43:58 -0500 (Mon, 20 Feb 2006)
New Revision: 57068

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
Log:
BoundColumn.cs: fixed InitializeCell function, if DataField is null or empty 
string, the cell should not be bound.

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs 
2006-02-20 14:35:40 UTC (rev 57067)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs 
2006-02-20 14:43:58 UTC (rev 57068)
@@ -93,20 +93,22 @@
                {
                        base.InitializeCell (cell, columnIndex, itemType);
 
+                       string df = DataField;
+
                        switch (itemType) {
                        case ListItemType.Item:
                        case ListItemType.SelectedItem:
                        case ListItemType.AlternatingItem:
-                               cell.DataBinding += new EventHandler 
(ItemDataBinding);
+                               if (df != null && df.Length != 0)
+                                       cell.DataBinding += new EventHandler 
(ItemDataBinding);
                                break;
                        case ListItemType.EditItem:
-                               if (ReadOnly) {
+                               if (ReadOnly && df != null && df.Length != 0) {
                                        cell.DataBinding += new EventHandler 
(ItemDataBinding);
                                        break;
                                }
-                               string df = DataField;
                                TextBox tb = new TextBox ();
-                               if (df != null && df != "")
+                               if (df != null && df.Length != 0)
                                        tb.DataBinding += new EventHandler 
(ItemDataBinding);
                                cell.Controls.Add (tb);
                                break;

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2006-02-20 14:35:40 UTC (rev 57067)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2006-02-20 14:43:58 UTC (rev 57068)
@@ -1,3 +1,8 @@
+2006-02-20  Vladimir Krasnov  <[EMAIL PROTECTED]>
+
+       * BoundColumn.cs: fixed InitializeCell function, if DataField is 
+       null or empty string, the cell should not be bound.
+
 2006-02-08  Chris Toshok  <[EMAIL PROTECTED]>
 
        * ListControl.cs (OnDataBinding): in 2.0, only clear our items if

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to