projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7c07d87)
2007-08-14 Marek Habersack <mhabersack@novell.com>
authorMarek Habersack <grendel@twistedcode.net>
Tue, 14 Aug 2007 11:43:42 +0000 (11:43 -0000)
committerMarek Habersack <grendel@twistedcode.net>
Tue, 14 Aug 2007 11:43:42 +0000 (11:43 -0000)
* ChangePassword.cs: The change password button id changed to
"ChangePasswordPushButton", the cancel button id changed to
"CancelPushButton". The change makes the generated ids the same
what on MS.NET. Fixes bug #82418.

2007-08-14  Marek Habersack  <mhabersack@novell.com>

* ChangePasswordTest.cs: adjust tests for the ChangePassword
control button controls id changes. Part of fix for bug #82418.

svn path=/trunk/mcs/; revision=84055

mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog patch | blob | history
mcs/class/System.Web/System.Web.UI.WebControls/ChangePassword.cs patch | blob | history
mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog patch | blob | history
mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs patch | blob | history

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 7ab26029bd20335aaa0d1dce27c8d9918e51edec..cc334005fb19699467e9225356444cdd837dc69c 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -3,6 +3,10 @@
        * ObjectDataSourceView.cs: remove unused variable.
 
        * ChangePassword.cs: remove unused variable.
+       The change password button id changed to
+       "ChangePasswordPushButton", the cancel button id changed to
+       "CancelPushButton". The change makes the generated ids the same
+       what on MS.NET. Fixes bug #82418.
 
        * RoleGroupCollection.cs: OnValidate shouldn't be overridden.
 
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangePassword.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ChangePassword.cs
index 03d515c56048ea9a337106b4f0743b0031b347fc..bbc1e525ca8bb7e028aa1f4e5dc6bda7e8de9e05 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangePassword.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangePassword.cs
@@ -1412,7 +1412,7 @@ namespace System.Web.UI.WebControls
                                                break;
                                }
 
-                               ChangePasswordButton.ID = "ChangePasswordButton";
+                               ChangePasswordButton.ID = "ChangePasswordPushButton";
                                ChangePasswordButton.ApplyStyle (_owner.ChangePasswordButtonStyle);
                                ((IButtonControl) ChangePasswordButton).CommandName = ChangePassword.ChangePasswordButtonCommandName;
                                ((IButtonControl) ChangePasswordButton).Text = _owner.ChangePasswordButtonText;
@@ -1431,7 +1431,7 @@ namespace System.Web.UI.WebControls
                                                break;
                                }
 
-                               CancelButton.ID = "CancelButton";
+                               CancelButton.ID = "CancelPushButton";
                                CancelButton.ApplyStyle (_owner.CancelButtonStyle);
                                ((IButtonControl) CancelButton).CommandName = ChangePassword.CancelButtonCommandName;
                                ((IButtonControl) CancelButton).Text = _owner.CancelButtonText;
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
index cdb007aae14cc4986d16df6786765fbcb797f90c..3ca0f6b9319cf8a0fd83b2e46c74cefaab72e3b8 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-14  Marek Habersack  <mhabersack@novell.com>
+
+       * ChangePasswordTest.cs: adjust tests for the ChangePassword
+       control button controls id changes. Part of fix for bug #82418.
+
 2007-08-06 Igor Zelmanovich <igorz@mainsoft.com>
 
        * DataSourceViewTest.cs:
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs
index 22418a9c88af73ebc24976193c48afc8d917e3e0..b4548dcde785f4af83690277aa87bba4def16d7d 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs
@@ -552,9 +552,9 @@ namespace MonoTests.System.Web.UI.WebControls
                        fr.Controls.Add (new BaseControl (GetDecoratedId (html, "CurrentPassword"), "heh"));\r
                        fr.Controls.Add (new BaseControl (GetDecoratedId (html, "NewPassword"), "hehe"));\r
                        fr.Controls.Add (new BaseControl (GetDecoratedId (html, "ConfirmNewPassword"), "hehe"));\r
-                       string button = GetDecoratedId (html, "ChangePasswordButton");\r
+                       string button = GetDecoratedId (html, "ChangePasswordPushButton");\r
                        if (button.Length > 0)\r
-                               fr.Controls.Add (new BaseControl (GetDecoratedId (html, "ChangePasswordButton"), "ChangePasswordButton"));\r
+                               fr.Controls.Add (new BaseControl (GetDecoratedId (html, "ChangePasswordPushButton"), "ChangePasswordPushButton"));\r
                        else\r
                                fr.Controls.Add (new BaseControl ("__EVENTTARGET", GetEventTarget (html, "ChangePassword")));\r
 \r
@@ -578,13 +578,8 @@ namespace MonoTests.System.Web.UI.WebControls
                        fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$CurrentPassword");\r
                        fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$NewPassword");\r
                        fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$ConfirmNewPassword");\r
-#if DOT_NET\r
                        fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$CancelPushButton");\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$CancelPushButton"].Value = "Cancel";\r
-#else\r
-                       fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$CancelButton");\r
-                       fr.Controls ["ChangePassword1$ChangePasswordContainerID$CancelButton"].Value = "Cancel";\r
-#endif\r
                        t.Request = fr;\r
                        html = t.Run ();\r
                        if (t.UserData == null || t.UserData.ToString () != "CancelButtonClick")\r
@@ -623,13 +618,8 @@ namespace MonoTests.System.Web.UI.WebControls
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$CurrentPassword"].Value = "a";\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$NewPassword"].Value = "1";\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$ConfirmNewPassword"].Value = "1";\r
-#if DOT_NET\r
                        fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$ChangePasswordPushButton");\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$ChangePasswordPushButton"].Value = "Change+Password";\r
-#else\r
-                       fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$ChangePasswordButton");\r
-                       fr.Controls ["ChangePassword1$ChangePasswordContainerID$ChangePasswordButton"].Value = "Change+Password";\r
-#endif\r
                        t.Request = fr;\r
                        html = t.Run ();\r
                        if (t.UserData == null || t.UserData.ToString () != "ChangingPassword")\r
@@ -671,13 +661,8 @@ namespace MonoTests.System.Web.UI.WebControls
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$CurrentPassword"].Value = "a";\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$NewPassword"].Value = "1";\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$ConfirmNewPassword"].Value = "1";\r
-#if DOT_NET\r
                        fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$ChangePasswordPushButton");\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$ChangePasswordPushButton"].Value = "Change+Password";\r
-#else\r
-                       fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$ChangePasswordButton");\r
-                       fr.Controls ["ChangePassword1$ChangePasswordContainerID$ChangePasswordButton"].Value = "Change+Password";\r
-#endif\r
                        t.Request = fr;\r
                        html = t.Run ();\r
                        if (t.UserData == null || t.UserData.ToString () != "ChangePasswordError")\r
@@ -716,13 +701,8 @@ namespace MonoTests.System.Web.UI.WebControls
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$CurrentPassword"].Value = "p@ssword";\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$NewPassword"].Value = "123456?";\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$ConfirmNewPassword"].Value = "123456?";\r
-#if DOT_NET\r
                        fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$ChangePasswordPushButton");\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$ChangePasswordPushButton"].Value = "Change+Password";\r
-#else\r
-                       fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$ChangePasswordButton");\r
-                       fr.Controls ["ChangePassword1$ChangePasswordContainerID$ChangePasswordButton"].Value = "Change+Password";\r
-#endif\r
                        t.Request = fr;\r
                        html = t.Run ();\r
                        if (t.UserData == null || t.UserData.ToString () != "ChangedPassword")\r
@@ -760,13 +740,8 @@ namespace MonoTests.System.Web.UI.WebControls
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$CurrentPassword"].Value = "p@ssword";\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$NewPassword"].Value = "123456?";\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$ConfirmNewPassword"].Value = "123456?";\r
-#if DOT_NET\r
                        fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$ChangePasswordPushButton");\r
                        fr.Controls["ChangePassword1$ChangePasswordContainerID$ChangePasswordPushButton"].Value = "Change+Password";\r
-#else\r
-                       fr.Controls.Add ("ChangePassword1$ChangePasswordContainerID$ChangePasswordButton");\r
-                       fr.Controls ["ChangePassword1$ChangePasswordContainerID$ChangePasswordButton"].Value = "Change+Password";\r
-#endif\r
 \r
                        t.Request = fr;\r
                        html = t.Run ();\r
my mono mirror. check out Moved to http://github.com/mono/mono