Author: igorz
Date: 2007-01-01 11:37:54 -0500 (Mon, 01 Jan 2007)
New Revision: 70320

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedField.cs
   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/CheckBoxField.cs
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
   trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs
   
trunk/mcs/class/System.Web/Test/mainsoft/NunitWebResources/DetailsViewDataActions.aspx
Log:
2007-01-01 Igor Zelmanovich <[EMAIL PROTECTED]>

        * AutoGeneratedField.cs: is editable in Insest mode.
        * BoundField.cs: is editable in Insest mode.
        * CheckBoxField.cs: is editable in Insest mode.
        * DetailsView.cs: fixed DataBinding flow.                       


Modified: 
trunk/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedField.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedField.cs  
2007-01-01 16:13:44 UTC (rev 70319)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedField.cs  
2007-01-01 16:37:54 UTC (rev 70320)
@@ -87,8 +87,11 @@
                        DataControlFieldCell cell, DataControlRowState 
rowState, bool includeReadOnly)
                {
                        if (dataType == typeof(bool)) {
-                               CheckBox box = (CheckBox) cell.Controls [0];
-                               dictionary [DataField] = box.Checked;
+                               bool editable = IsEditable (rowState);
+                               if (editable || includeReadOnly) {
+                                       CheckBox box = (CheckBox) cell.Controls 
[0];
+                                       dictionary [DataField] = box.Checked;
+                               }
                        } else
                                base.ExtractValuesFromCell (dictionary, cell, 
rowState, includeReadOnly);
                }
@@ -97,11 +100,10 @@
                [MonoTODO ("Support other data types")]
                protected override void InitializeDataCell 
(DataControlFieldCell cell, DataControlRowState rowState)
                {
-                       bool editable = (rowState & (DataControlRowState.Edit | 
DataControlRowState.Insert)) != 0;
-                       
                        if (dataType == typeof(bool)) {
+                               bool editable = IsEditable (rowState);
                                CheckBox box = new CheckBox ();
-                               box.Enabled = editable && !ReadOnly;
+                               box.Enabled = editable;
                                box.ToolTip = HeaderText;
                                cell.Controls.Add (box);
                        } else

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs  
2007-01-01 16:13:44 UTC (rev 70319)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs  
2007-01-01 16:37:54 UTC (rev 70320)
@@ -138,8 +138,8 @@
                public override void ExtractValuesFromCell (IOrderedDictionary 
dictionary,
                        DataControlFieldCell cell, DataControlRowState 
rowState, bool includeReadOnly)
                {
-                       bool editable = (rowState & (DataControlRowState.Edit | 
DataControlRowState.Insert)) != 0;
-                       if (editable && !ReadOnly) {
+                       bool editable = IsEditable (rowState);
+                       if (editable) {
                                if (cell.Controls.Count > 0) {
                                        TextBox box = (TextBox) cell.Controls 
[0];
                                        dictionary [DataField] = box.Text;
@@ -168,14 +168,20 @@
                
                protected virtual void InitializeDataCell (DataControlFieldCell 
cell, DataControlRowState rowState)
                {
-                       bool editable = (rowState & (DataControlRowState.Edit | 
DataControlRowState.Insert)) != 0;
-                       if (editable && !ReadOnly) {
+                       bool editable = IsEditable (rowState);
+                       if (editable) {
                                TextBox box = new TextBox ();
                                box.ID = cell.ClientID;
                                cell.Controls.Add (box);
+                               box.ToolTip = HeaderText;
                        }
                }
-               
+
+               internal bool IsEditable (DataControlRowState rowState)
+               {
+                       return ((rowState & DataControlRowState.Edit) != 0 && 
!ReadOnly) || ((rowState & DataControlRowState.Insert) != 0 && InsertVisible);
+               }
+
                protected virtual bool SupportsHtmlEncode {
                        get { return true; }
                }

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-01-01 16:13:44 UTC (rev 70319)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-01-01 16:37:54 UTC (rev 70320)
@@ -1,5 +1,12 @@
 2007-01-01 Igor Zelmanovich <[EMAIL PROTECTED]>
 
+       * AutoGeneratedField.cs: is editable in Insest mode.
+       * BoundField.cs: is editable in Insest mode.
+       * CheckBoxField.cs: is editable in Insest mode.
+       * DetailsView.cs: fixed DataBinding flow.                       
+
+2007-01-01 Igor Zelmanovich <[EMAIL PROTECTED]>
+
        * BaseDataBoundControl.cs:
        * CompositeDataBoundControl.cs: fixed DataBinding flow.
 

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxField.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxField.cs       
2007-01-01 16:13:44 UTC (rev 70319)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxField.cs       
2007-01-01 16:37:54 UTC (rev 70320)
@@ -99,9 +99,9 @@
                
                protected override void InitializeDataCell 
(DataControlFieldCell cell, DataControlRowState rowState)
                {
-                       bool editable = (rowState & (DataControlRowState.Edit | 
DataControlRowState.Insert)) != 0;
+                       bool editable = IsEditable (rowState);
                        CheckBox box = new CheckBox ();
-                       box.Enabled = editable && !ReadOnly;
+                       box.Enabled = editable;
                        if (editable)
                                box.ToolTip = HeaderText;
                        box.Text = Text;
@@ -111,8 +111,11 @@
                public override void ExtractValuesFromCell (IOrderedDictionary 
dictionary,
                        DataControlFieldCell cell, DataControlRowState 
rowState, bool includeReadOnly)
                {
-                       CheckBox box = (CheckBox) cell.Controls [0];
-                       dictionary [DataField] = box.Checked;
+                       bool editable = IsEditable (rowState);
+                       if (editable || includeReadOnly) {
+                               CheckBox box = (CheckBox) cell.Controls [0];
+                               dictionary [DataField] = box.Checked;
+                       }
                }
                
                protected override void OnDataBindField (object sender, 
EventArgs e)

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs 
2007-01-01 16:13:44 UTC (rev 70319)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs 
2007-01-01 16:37:54 UTC (rev 70320)
@@ -1100,8 +1100,8 @@
                                dataItem = null;
                        
                        // Creates the set of fields to show
-                       
-                       ICollection fieldCollection = CreateFieldSet (dataItem, 
dataBinding);
+
+                       ICollection fieldCollection = CreateFieldSet (dataItem, 
dataBinding && dataItem != null);
                        DataControlField[] fields = new DataControlField 
[fieldCollection.Count];
                        fieldCollection.CopyTo (fields, 0);
 
@@ -1279,6 +1279,7 @@
                        if (CurrentMode == DetailsViewMode.Insert) {
                                RequiresDataBinding = false;
                                PerformDataBinding (new object [] { null });
+                               MarkAsDataBound ();
                                return;
                        }
                        
@@ -1401,13 +1402,17 @@
                {
                        DetailsViewCommandEventArgs args = e as 
DetailsViewCommandEventArgs;
                        if (args != null) {
-                               OnItemCommand (args);
-                               ProcessEvent (args.CommandName, 
args.CommandArgument as string);
+                               ProcessCommand (args);
                                return true;
                        }
                        return base.OnBubbleEvent (source, e);
                }
 
+               void ProcessCommand (DetailsViewCommandEventArgs args) {
+                       OnItemCommand (args);
+                       ProcessEvent (args.CommandName, args.CommandArgument as 
string);
+               }
+
                void IPostBackEventHandler.RaisePostBackEvent (string 
eventArgument)
                {
                        RaisePostBackEvent (eventArgument);
@@ -1417,10 +1422,12 @@
                protected virtual void RaisePostBackEvent (string eventArgument)
                {
                        int i = eventArgument.IndexOf ('$');
+                       CommandEventArgs arg;
                        if (i != -1)
-                               ProcessEvent (eventArgument.Substring (0, i), 
eventArgument.Substring (i + 1));
+                               arg = new CommandEventArgs 
(eventArgument.Substring (0, i), eventArgument.Substring (i + 1));
                        else
-                               ProcessEvent (eventArgument, null);
+                               arg = new CommandEventArgs (eventArgument, 
null);
+                       ProcessCommand (new DetailsViewCommandEventArgs (this, 
arg));
                }
                
                void ProcessEvent (string eventName, string param)

Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog 
2007-01-01 16:13:44 UTC (rev 70319)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog 
2007-01-01 16:37:54 UTC (rev 70320)
@@ -1,3 +1,7 @@
+2007-01-01 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+       * DetailsViewTest.cs: fixed tests, removed NotWorking attribute.
+
 2006-12-26 Igor Zelmanovich <[EMAIL PROTECTED]>
 
        * WebControlTest.cs: added tests.

Modified: 
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs
===================================================================
--- 
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs    
    2007-01-01 16:13:44 UTC (rev 70319)
+++ 
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs    
    2007-01-01 16:37:54 UTC (rev 70320)
@@ -1323,7 +1323,6 @@
 
                [Test]
                [Category ("NunitWeb")]
-               [Category ("NotWorking")]
                public void DetailsView_EditPostback ()
                {
                        WebTest t = new WebTest ("DetailsViewDataActions.aspx");
@@ -1338,28 +1337,30 @@
                        t.Request = fr;                 
                        pageHTML = t.Run ();
                        pageHTML = pageHTML.Substring (pageHTML.IndexOf 
("starttest") + 9, pageHTML.IndexOf ("endtest") - pageHTML.IndexOf 
("starttest") - 9);
-                       string origHtmlValue = @" <div>
-                                               &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;
-                                               <div>
-                                               <table cellspacing=""0"" 
rules=""all"" border=""1"" id=""DetailsView1"" 
style=""height:50px;width:125px;border-collapse:collapse;"">
-                                               <tr>
-                                               <td>ID</td><td>1001</td>
-                                               </tr><tr>
-                                               <td>FName</td><td>Mahesh</td>
-                                               </tr><tr>
-                                               <td>LName</td><td>Chand</td>
-                                               </tr><tr>
-                                               <td colspan=""2""><a 
href=""javascript:__doPostBack('DetailsView1$ctl01','')"">Update</a>&nbsp;<a 
href=""javascript:__doPostBack('DetailsView1','Cancel$0')"">Cancel</a></td>
-                                               </tr><tr>
-                                               <td colspan=""2""><table 
border=""0"">
-                                               <tr>
-                                               <td><span>1</span></td><td><a 
href=""javascript:__doPostBack('DetailsView1','Page$2')"">2</a></td><td><a 
href=""javascript:__doPostBack('DetailsView1','Page$3')"">3</a></td>
-                                               </tr>
-                                               </table></td>
-                                               </tr>
-                                               </table>
-                                               </div>     
-                                               </div>";
+                       string origHtmlValue = @"<div>
+        &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;
+        <div>
+       <table cellspacing=""0"" rules=""all"" border=""1"" id=""DetailsView1"" 
style=""height:50px;width:125px;border-collapse:collapse;"">
+               <tr>
+                       <td>ID</td><td>1001</td>
+               </tr><tr>
+                       <td>FName</td><td><input name=""DetailsView1$ctl01"" 
type=""text"" value=""Mahesh"" title=""FName"" /></td>
+               </tr><tr>
+                       <td>LName</td><td><input name=""DetailsView1$ctl02"" 
type=""text"" value=""Chand"" title=""LName"" /></td>
+               </tr><tr>
+                       <td colspan=""2""><a 
href=""javascript:__doPostBack('DetailsView1$ctl03','')"">Update</a>&nbsp;<a 
href=""javascript:__doPostBack('DetailsView1','Cancel$0')"">Cancel</a></td>
+               </tr><tr>
+                       <td colspan=""2""><table border=""0"">
+                               <tr>
+                                       <td><span>1</span></td><td><a 
href=""javascript:__doPostBack('DetailsView1','Page$2')"">2</a></td><td><a 
href=""javascript:__doPostBack('DetailsView1','Page$3')"">3</a></td>
+                               </tr>
+                       </table></td>
+               </tr>
+       </table>
+</div>
+        
+    
+    </div>";
                                        HtmlDiff.AssertAreEqual (origHtmlValue, 
pageHTML, "AfterEditPostback");
                                        // Checking for change mode event fired.
                                        ArrayList eventlist = t.UserData as 
ArrayList;
@@ -1510,7 +1511,7 @@
 
                [Test]
                [Category ("NunitWeb")]
-               [Category ("NotWorking")] // Implementation details in mono
+               [Category ("NotDotNet")] // Implementation details in mono
                public void DetailsView_InsertPostback ()
                {
                        WebTest t = new WebTest ("DetailsViewDataActions.aspx");
@@ -1544,6 +1545,7 @@
                        HtmlDiff.AssertAreEqual (origHtmlValue, pageHTML, 
"InsertDataPostback");
                        
                        fr = new FormRequest (t.Response, "form1");
+#if DOT_NET
                        fr.Controls.Add ("__EVENTTARGET");
                        fr.Controls.Add ("__EVENTARGUMENT");
                        fr.Controls.Add ("DetailsView1$ctl01");
@@ -1555,6 +1557,19 @@
                        fr.Controls["DetailsView1$ctl01"].Value = "123";
                        fr.Controls["DetailsView1$ctl02"].Value = "123";
                        fr.Controls["DetailsView1$ctl03"].Value = "123";
+#else
+                       fr.Controls.Add ("__EVENTTARGET");
+                       fr.Controls.Add ("__EVENTARGUMENT");
+                       fr.Controls.Add ("DetailsView1:_ctl1c");
+                       fr.Controls.Add ("DetailsView1:_ctl2c");
+                       fr.Controls.Add ("DetailsView1:_ctl3c");
+
+                       fr.Controls ["__EVENTTARGET"].Value = 
"DetailsView1:_ctl4c";
+                       fr.Controls["__EVENTARGUMENT"].Value = "";
+                       fr.Controls ["DetailsView1:_ctl1c"].Value = "123";
+                       fr.Controls ["DetailsView1:_ctl2c"].Value = "123";
+                       fr.Controls ["DetailsView1:_ctl3c"].Value = "123";
+#endif
                        t.Request = fr;                 
                        t.Run ();
 
@@ -1675,7 +1690,7 @@
 
                [Test]
                [Category ("NunitWeb")]
-               [Category ("NotWorking")] // Implementation details in mono
+               [Category ("NotDotNet")] // Implementation details in mono
                public void DetailsView_UpdatePostback ()
                {
                        WebTest t = new WebTest ("DetailsViewDataActions.aspx");
@@ -1690,17 +1705,27 @@
                        pageHTML = t.Run ();
                        
                        fr = new FormRequest (t.Response, "form1");
+#if DOT_NET
                        fr.Controls.Add ("__EVENTTARGET");
                        fr.Controls.Add ("__EVENTARGUMENT");
                        fr.Controls.Add ("DetailsView1$ctl01");
                        fr.Controls.Add ("DetailsView1$ctl02");
-                       fr.Controls.Add ("DetailsView1$ctl03");
 
-                       fr.Controls["__EVENTTARGET"].Value = 
"DetailsView1$ctl04";
+                       fr.Controls["__EVENTTARGET"].Value = 
"DetailsView1$ctl03";
                        fr.Controls["__EVENTARGUMENT"].Value = "";
                        fr.Controls["DetailsView1$ctl01"].Value = "1";
                        fr.Controls["DetailsView1$ctl02"].Value = "2";
-                       fr.Controls["DetailsView1$ctl03"].Value = "3";
+#else
+                       fr.Controls.Add ("__EVENTTARGET");
+                       fr.Controls.Add ("__EVENTARGUMENT");
+                       fr.Controls.Add ("DetailsView1:_ctl1c");
+                       fr.Controls.Add ("DetailsView1:_ctl2c");
+
+                       fr.Controls ["__EVENTTARGET"].Value = 
"DetailsView1:_ctl3c";
+                       fr.Controls ["__EVENTARGUMENT"].Value = "";
+                       fr.Controls ["DetailsView1:_ctl1c"].Value = "1";
+                       fr.Controls ["DetailsView1:_ctl2c"].Value = "2";
+#endif
                        t.Request = fr;
                        t.Run ();
 
@@ -2535,3 +2560,4 @@
 
 
 
+

Modified: 
trunk/mcs/class/System.Web/Test/mainsoft/NunitWebResources/DetailsViewDataActions.aspx
===================================================================
--- 
trunk/mcs/class/System.Web/Test/mainsoft/NunitWebResources/DetailsViewDataActions.aspx
      2007-01-01 16:13:44 UTC (rev 70319)
+++ 
trunk/mcs/class/System.Web/Test/mainsoft/NunitWebResources/DetailsViewDataActions.aspx
      2007-01-01 16:37:54 UTC (rev 70320)
@@ -11,7 +11,7 @@
 
     protected void Page_Load (object sender, EventArgs e)
     {
-        DetailsView1.DataKeyNames = new string[] { "ID", "FName", "LName" };
+        DetailsView1.DataKeyNames = new string[] { "ID" };
         MonoTests.System.Web.UI.WebControls.TableObject.ds = 
MonoTests.System.Web.UI.WebControls.TableObject.CreateDataTable();
         
         

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

Reply via email to