Author: yonik
Date: 2007-04-05 06:51:06 -0400 (Thu, 05 Apr 2007)
New Revision: 75421
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/EditUser.aspx.designer.cs
Log:
By :Yonik <[EMAIL PROTECTED]> Date: 05.04.07
Fix for bug 7486 (WSAT should not work when the application is configured to
work with portal providers)
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx
2007-04-05 08:24:50 UTC (rev 75420)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx
2007-04-05 10:51:06 UTC (rev 75421)
@@ -42,17 +42,17 @@
</tr>
<tr>
<td>
- Created users : <%= User_count %>
+ <%= User_count %>
</td>
</tr>
<tr>
<td>
- <asp:HyperLink ID="HyperLink1" runat="server"
NavigateUrl="CreateUser.aspx">Create user</asp:HyperLink>
+ <asp:HyperLink ID="HyperLink1" runat="server"
NavigateUrl="CreateUser.aspx" OnLoad="UsersLinks_Load">Create
user</asp:HyperLink>
</td>
</tr>
<tr>
<td>
- <asp:HyperLink ID="HyperLink2" runat="server"
NavigateUrl="ManageUser.aspx">Manage users</asp:HyperLink>
+ <asp:HyperLink ID="HyperLink2" runat="server"
NavigateUrl="ManageUser.aspx" OnLoad="UsersLinks_Load">Manage
users</asp:HyperLink>
</td>
</tr>
</table>
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx.cs
2007-04-05 08:24:50 UTC (rev 75420)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx.cs
2007-04-05 10:51:06 UTC (rev 75421)
@@ -33,10 +33,23 @@
using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
+
namespace Mainsoft.Web.AspnetConfig
{
public partial class Default : System.Web.UI.Page
{
+ private bool IsPortalRoleProvider;
+ private bool IsPortalMembershipProvider;
+ protected override void OnInit (EventArgs e)
+ {
+ try {
+ IsPortalRoleProvider = (Roles.Provider).GetType
().ToString () == "Mainsoft.Web.Security.WPGroupsRoleProvider";
+ }
+ catch{
+ }
+ IsPortalMembershipProvider =
(Membership.Provider).GetType().ToString () ==
"Mainsoft.Web.Security.WPMembershipProvider";
+ }
+
protected void Page_Load (object sender, EventArgs e)
{
Button bt = Master.FindControl ("Back") as Button;
@@ -49,8 +62,13 @@
{
get
{
- MembershipUserCollection user_collection =
Membership.GetAllUsers ();
- return user_collection.Count.ToString ();
+ if (IsPortalMembershipProvider) {
+ return "You cannot create or manage
users when WPMembershipProvider is configured as the default provider.";
+ }
+ else {
+ MembershipUserCollection
user_collection = Membership.GetAllUsers ();
+ return "Created users :" +
user_collection.Count.ToString ();
+ }
}
}
@@ -58,7 +76,10 @@
{
get
{
- if (Roles.Enabled) {
+ if (IsPortalRoleProvider) {
+ return @"You cannot create or manage
roles when WPGroupsRoleProvider is configured as the default provider.";
+ }
+ else if (Roles.Enabled) {
string[] list = Roles.GetAllRoles ();
return "Existing roles :" +
list.Length.ToString ();
}
@@ -74,8 +95,15 @@
protected void HyperLink1_Load (object sender, EventArgs e)
{
- if (!Roles.Enabled)
+ if (!Roles.Enabled || IsPortalRoleProvider)
((HyperLink) sender).Visible = false;
}
+
+ protected void UsersLinks_Load (object sender, EventArgs e)
+ {
+ if (IsPortalMembershipProvider) {
+ ((HyperLink) sender).Visible = false;
+ }
+ }
}
}
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/EditUser.aspx.designer.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/EditUser.aspx.designer.cs
2007-04-05 08:24:50 UTC (rev 75420)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/EditUser.aspx.designer.cs
2007-04-05 10:51:06 UTC (rev 75421)
@@ -19,6 +19,7 @@
protected System.Web.UI.WebControls.TextBox desc_txb;
protected System.Web.UI.WebControls.Button save_bt;
protected Mainsoft.Web.AspnetConfig.Searcher srch;
+ protected System.Web.UI.WebControls.RequiredFieldValidator
required_email_validator;
protected System.Web.UI.WebControls.RegularExpressionValidator
RegularExpressionValidator1;
protected System.Web.UI.WebControls.View successupdate;
protected System.Web.UI.WebControls.Label name_lbl;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
