Author: igorz
Date: 2007-02-26 10:26:29 -0500 (Mon, 26 Feb 2007)
New Revision: 73434
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/LoginView.cs
Log:
2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
* LoginView.cs: fixed:
ViewChanging and ViewChanged are fired.
optimized Save/Load control state.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-02-26 15:09:52 UTC (rev 73433)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-02-26 15:26:29 UTC (rev 73434)
@@ -1,5 +1,11 @@
2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
+ * LoginView.cs: fixed:
+ ViewChanging and ViewChanged are fired.
+ optimized Save/Load control state.
+
+2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
+
* CreateUserWizard.cs: fixed: does not attempt to send email if
MailDefinition is not defined.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/LoginView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/LoginView.cs
2007-02-26 15:09:52 UTC (rev 73433)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/LoginView.cs
2007-02-26 15:26:29 UTC (rev 73434)
@@ -114,11 +114,18 @@
bool IsAuthenticated {
get {
- if (Page != null)
- isAuthenticated =
Page.Request.IsAuthenticated;
-
return isAuthenticated;
}
+ set {
+ if (value == isAuthenticated)
+ return;
+
+ isAuthenticated = value;
+
+ OnViewChanging (EventArgs.Empty);
+ CreateChildControls();
+ OnViewChanged (EventArgs.Empty);
+ }
}
[MonoTODO ("Handle RoleGroups")]
@@ -155,14 +162,10 @@
protected internal override void LoadControlState (object
savedState)
{
- if (savedState == null) {
- base.LoadControlState (savedState);
+ if (savedState == null)
return;
- }
- Pair pair = (Pair)savedState;
- base.LoadControlState (pair.First);
- isAuthenticated = (bool)pair.Second;
+ isAuthenticated = (bool) savedState;
}
protected internal override void OnInit (EventArgs e)
@@ -175,8 +178,8 @@
protected internal override void OnPreRender (EventArgs e)
{
base.OnPreRender (e);
- isAuthenticated = IsAuthenticated;
- EnsureChildControls ();
+ if (Page != null)
+ IsAuthenticated = Page.Request.IsAuthenticated;
}
protected virtual void OnViewChanged (EventArgs e)
@@ -200,11 +203,10 @@
protected internal override object SaveControlState ()
{
- object baseState = base.SaveControlState ();
if (isAuthenticated)
- return new Pair (baseState, isAuthenticated);
+ return isAuthenticated;
- return baseState;
+ return null;
}
[MonoTODO ("for design-time usage - no more details available")]
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches