yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '6.0.7' of https://github.com/bokmadsen/Umbraco-CMS into bokmadsen-6.0.7

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-06-19 14:50:41 +02:00
parent aaa4469def 51b5334126
commit b8304c03ee
4 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
View File

@@ -123,7 +123,7 @@ namespace umbraco.cms.presentation.create.controls
/// <param name="e"></param>
protected void EmailExistsCheck(object sender, ServerValidateEventArgs e)
{
if (Email.Text != "" && Member.GetMemberFromEmail(Email.Text.ToLower()) != null)
if (Email.Text != "" && Member.GetMemberFromEmail(Email.Text.ToLower()) != null && Membership.Providers[Member.UmbracoMemberProviderName].RequiresUniqueEmail)
e.IsValid = false;
else
e.IsValid = true;

16
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
View File

@@ -28,6 +28,7 @@ namespace umbraco.cms.presentation.members
protected PlaceHolder MemberPasswordTxt = new PlaceHolder();
protected TextBox MemberEmail = new TextBox();
protected CustomValidator MemberEmailExistCheck = new CustomValidator();
protected controls.DualSelectbox _memberGroups = new controls.DualSelectbox();
@@ -65,8 +66,15 @@ namespace umbraco.cms.presentation.members
MemberLoginNameVal.EnableClientScript = false;
MemberLoginNameVal.Display = ValidatorDisplay.Dynamic;
MemberEmailExistCheck.ErrorMessage = ui.Text("errorHandling", "errorExistsWithoutTab", "E-mail", BasePages.UmbracoEnsuredPage.CurrentUser);
MemberEmailExistCheck.EnableClientScript = false;
MemberEmailExistCheck.ValidateEmptyText = false;
MemberEmailExistCheck.ControlToValidate = MemberEmail.ID;
MemberEmailExistCheck.ServerValidate += MemberEmailExistCheck_ServerValidate;
_contentControl.PropertiesPane.addProperty(ui.Text("login"), ph);
_contentControl.PropertiesPane.addProperty(ui.Text("password"), MemberPasswordTxt);
_contentControl.PropertiesPane.addProperty("", MemberEmailExistCheck);
_contentControl.PropertiesPane.addProperty("Email", MemberEmail);
}
else
@@ -132,6 +140,14 @@ namespace umbraco.cms.presentation.members
}
void MemberEmailExistCheck_ServerValidate(object source, ServerValidateEventArgs args)
{
if (MemberEmail.Text != "" && Member.GetMemberFromEmail(MemberEmail.Text.ToLower()) != null && Membership.Providers[Member.UmbracoMemberProviderName].RequiresUniqueEmail)
args.IsValid = false;
else
args.IsValid = true;
}
void MenuSaveClick(object sender, ImageClickEventArgs e)
{