Author: igorz
Date: 2007-11-08 04:29:39 -0500 (Thu, 08 Nov 2007)
New Revision: 89179
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ImageField.cs
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/AutoGeneratedFieldTest.cs
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
Log:
2007-11-08 Igor Zelmanovich <[EMAIL PROTECTED]>
* BoundField.cs:
* ImageField.cs:
evaluate bound value using ThisExpession ("!") properly
2007-11-08 Igor Zelmanovich <[EMAIL PROTECTED]>
* AutoGeneratedFieldTest.cs:
Added new test.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs
2007-11-08 08:41:25 UTC (rev 89178)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs
2007-11-08 09:29:39 UTC (rev 89179)
@@ -226,7 +226,7 @@
throw new HttpException ("A data item was not
found in the container. The container must either implement IDataItemContainer,
or have a property named DataItem.");
if (DataField == ThisExpression)
- return dataItem.ToString ();
+ return dataItem;
else if (DataField == string.Empty)
return null;
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-11-08 08:41:25 UTC (rev 89178)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-11-08 09:29:39 UTC (rev 89179)
@@ -1,3 +1,9 @@
+2007-11-08 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * BoundField.cs:
+ * ImageField.cs:
+ evaluate bound value using ThisExpession ("!") properly
+
2007-11-07 Igor Zelmanovich <[EMAIL PROTECTED]>
* WebControl.cs: enabled state restored properly.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ImageField.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ImageField.cs
2007-11-08 08:41:25 UTC (rev 89178)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ImageField.cs
2007-11-08 09:29:39 UTC (rev 89179)
@@ -274,7 +274,7 @@
if (dataItem == null)
throw new HttpException ("A data item
was not found in the container. The container must either implement
IDataItemContainer, or have a property named DataItem.");
if (fieldName == ThisExpression)
- return dataItem.ToString ();
+ return dataItem;
else {
if (cachedDescriptor != null) return
cachedDescriptor.GetValue (dataItem);
PropertyDescriptor prop = GetProperty
(controlContainer, fieldName);
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/AutoGeneratedFieldTest.cs
===================================================================
---
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/AutoGeneratedFieldTest.cs
2007-11-08 08:41:25 UTC (rev 89178)
+++
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/AutoGeneratedFieldTest.cs
2007-11-08 09:29:39 UTC (rev 89179)
@@ -114,9 +114,15 @@
public void AutoGeneratedField_ValidateSupportsCallback ()
{
//This method has been implemented as an empty method
+ }
+
+ [Test]
+ public void AutoGeneratedField_BoolArray () {
+ GridView GridView1 = new GridView ();
+ GridView1.DataSource = new bool [] { true };
+ GridView1.DataBind ();
}
-
[Test]
[ExpectedException(typeof(NotSupportedException))]
public void AutoGeneratedField_ConvertEmptyStringToNullExeption
()
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2007-11-08 08:41:25 UTC (rev 89178)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2007-11-08 09:29:39 UTC (rev 89179)
@@ -1,3 +1,8 @@
+2007-11-08 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * AutoGeneratedFieldTest.cs:
+ Added new test.
+
2007-11-07 Igor Zelmanovich <[EMAIL PROTECTED]>
* WebControlTest.cs:
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
