Fixed CreateUser and EditUser pages

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

diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/CreateUser.aspx.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/CreateUser.aspx.cs
index 39f9e178d68fe32a5f5ab21dfdb17acaf48023d6..3eba3805692576b8a1c53915860547679c2fd829 100644 (file)
--- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/CreateUser.aspx.cs
+++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/CreateUser.aspx.cs
@@ -57,12 +57,8 @@ namespace Mainsoft.Web.Administration
                public void CreateUserWizard1_CreatedUser (object sender, EventArgs e)\r
                {\r
                        MembershipUser user = Membership.GetUser (((CreateUserWizard) sender).UserName);\r
-                       user.IsApproved = active_chb.Checked;\r
                        roles_lst.Enabled = false;\r
-               }\r
-\r
-               public void CreateUserWizard1_CreatingUser (object sender, LoginCancelEventArgs e)\r
-               {\r
+                       \r
                        int i = 0;\r
                        while (i < roles_lst.Items.Count) {\r
                                if (roles_lst.Items[i].Selected) {\r
@@ -76,5 +72,10 @@ namespace Mainsoft.Web.Administration
                                i++;\r
                        }\r
                }\r
+\r
+               public void CreateUserWizard1_CreatingUser (object sender, LoginCancelEventArgs e)\r
+               {\r
+                       ((CreateUserWizard) sender).DisableCreatedUser = !active_chb.Checked;\r
+               }\r
        }\r
 }\r

diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/EditUser.aspx.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/EditUser.aspx.cs
index b0b184ebd7824e113d358c6b84a4a8e26840b81c..efbcc6de6d8c3ee2e96f4f1442aecddef5a5a4a9 100644 (file)
--- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/EditUser.aspx.cs
+++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/EditUser.aspx.cs
@@ -38,7 +38,7 @@ namespace Mainsoft.Web.Administration
                {\r
                        user_name = Request.QueryString["User"];\r
                        srch.User = user_name;\r
-                       if (MultiView1.ActiveViewIndex == 0) {\r
+                       if (!IsPostBack) {\r
                                FillUserData (user_name);\r
                                name_lbl.Text = user_name;\r
                        }\r
@@ -46,15 +46,11 @@ namespace Mainsoft.Web.Administration
 \r
                void FillUserData (string user_name)\r
                {\r
-                       if (MultiView1.ActiveViewIndex == 0) {\r
-                               MembershipUser user = Membership.GetUser (user_name);\r
-                               userid_txb.Text = user.UserName;\r
-                               email_txb.Text = user.Email;\r
-                               active_chb.Checked = user.IsApproved;\r
-                               if (user.Comment == string.Empty) {\r
-                                       desc_txb.Text = user.Comment;\r
-                               }\r
-                       }\r
+                       MembershipUser user = Membership.GetUser (user_name);\r
+                       userid_txb.Text = user.UserName;\r
+                       email_txb.Text = user.Email;\r
+                       active_chb.Checked = user.IsApproved;\r
+                       desc_txb.Text = user.Comment;\r
                }\r
 \r
                protected void roles_lst_DataBound (object sender, EventArgs e)\r