Author: krasnov
Date: 2007-01-11 05:06:45 -0500 (Thu, 11 Jan 2007)
New Revision: 70846
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
Log:
merge -r 70844:70845
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-11 09:57:25 UTC (rev 70845)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-01-11 10:06:45 UTC (rev 70846)
@@ -1,3 +1,8 @@
+2007-01-11 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * SqlDataSourceView.cs: fixed OnUpdating, OnInserting call with
+ SqlDataSourceCommandEventArgs
+
2007-01-10 Konstantin Triger <[EMAIL PROTECTED]>
* ObjectDataSourceView.cs: use case unsensitive comparer for
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
2007-01-11 09:57:25 UTC (rev 70845)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
2007-01-11 10:06:45 UTC (rev 70846)
@@ -148,7 +148,10 @@
InitializeParameters (command, InsertParameters,
values, null);
- OnInserting (new SqlDataSourceCommandEventArgs
(command));
+ SqlDataSourceCommandEventArgs args = new
SqlDataSourceCommandEventArgs (command);
+ OnInserting (args);
+ if (args.Cancel)
+ return -1;
bool closed = connection.State ==
ConnectionState.Closed;
if (closed)
@@ -323,7 +326,10 @@
InitializeParameters (command, UpdateParameters,
dataValues, oldDataValues);
- OnUpdating (new SqlDataSourceCommandEventArgs
(command));
+ SqlDataSourceCommandEventArgs args = new
SqlDataSourceCommandEventArgs (command);
+ OnUpdating (args);
+ if (args.Cancel)
+ return -1;
bool closed = connection.State ==
ConnectionState.Closed;
if (closed)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
