Jelajahi Sumber

fixed: when login attempt was not successful FailureText is shown.

svn path=/trunk/mcs/; revision=64793
Igor Zelmanovich 19 tahun lalu
induk
melakukan
6f3648d0f7

+ 5 - 0
mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,8 @@
+2006-09-03 Igor Zelmanovich <[email protected]>
+
+	* Login.cs: fixed:
+	when login attempt was not successful FailureText is shown.	 
+
 2006-08-31 Igor Zelmanovich <[email protected]>
 
 	* CreateUserWizard.cs: fixed: InvalidPasswordErrorMessage 

+ 16 - 2
mcs/class/System.Web/System.Web.UI.WebControls/Login.cs

@@ -440,6 +440,11 @@ namespace System.Web.UI.WebControls {
 		{
 		}
 
+		ITextControl FailureTextLabel {
+			get {
+				return FindControl ("FailureText") as ITextControl;
+			}
+		}
 
 		[DefaultValue (1)]
 		public virtual int BorderPadding {
@@ -1071,8 +1076,10 @@ namespace System.Web.UI.WebControls {
 
 			editable = container.UserNameTextBox as IEditableTextControl;
 
-			if (editable != null)
+			if (editable != null) {
+				editable.Text = UserName;
 				editable.TextChanged += new EventHandler (UserName_TextChanged);
+			}
 
 			editable = container.PasswordTextBox as IEditableTextControl;
 
@@ -1128,7 +1135,11 @@ namespace System.Web.UI.WebControls {
 			// check for submit button
 			CommandEventArgs cea = (e as CommandEventArgs);
 			if ((cea != null) && (cea.CommandName == LoginButtonCommandName)) {
-				AuthenticateUser ();
+				if (!AuthenticateUser ()) {
+					ITextControl failureText = FailureTextLabel;
+					if (failureText != null)
+						failureText.Text = FailureText;
+				}
 				return true;
 			}
 			return false;
@@ -1304,6 +1315,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
+		// TODO: its called from default template only, not usefully, OnBubbleEvent 
+		// do handle command, need be removed
+		[MonoTODO()]
 		private void LoginClick (object sender, CommandEventArgs e)
 		{
 			RaiseBubbleEvent (sender, (EventArgs)e);