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

Merge branch '6.2.0' of https://github.com/dprothero/Umbraco-CMS into dprothero-6.2.0

Browse Source 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
This commit is contained in:
Shannon
2013-12-19 11:59:22 +11:00
parent 3499f39970 6675bac1dc
commit b45306e1ff
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ namespace umbraco.cms.presentation.members
protected TextBox MemberLoginNameTxt = new TextBox();
protected RequiredFieldValidator MemberLoginNameVal = new RequiredFieldValidator();
protected CustomValidator MemberLoginNameExistCheck = new CustomValidator();
protected PlaceHolder MemberPasswordTxt = new PlaceHolder();
protected TextBox MemberEmail = new TextBox();
@@ -102,12 +103,19 @@ namespace umbraco.cms.presentation.members
MemberLoginNameVal.EnableClientScript = false;
MemberLoginNameVal.Display = ValidatorDisplay.Dynamic;
MemberLoginNameExistCheck.ErrorMessage = ui.Text("errorHandling", "errorExistsWithoutTab", "Login Name", BasePages.UmbracoEnsuredPage.CurrentUser);
MemberLoginNameExistCheck.EnableClientScript = false;
MemberLoginNameExistCheck.ValidateEmptyText = false;
MemberLoginNameExistCheck.ControlToValidate = MemberLoginNameTxt.ID;
MemberLoginNameExistCheck.ServerValidate += MemberLoginNameExistCheck_ServerValidate;
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("", MemberLoginNameExistCheck);
_contentControl.PropertiesPane.addProperty(ui.Text("login"), ph);
_contentControl.PropertiesPane.addProperty(ui.Text("password"), MemberPasswordTxt);
_contentControl.PropertiesPane.addProperty("", MemberEmailExistCheck);
@@ -187,7 +195,18 @@ namespace umbraco.cms.presentation.members
}
void MemberEmailExistCheck_ServerValidate(object source, ServerValidateEventArgs args)
void MemberLoginNameExistCheck_ServerValidate(object source, ServerValidateEventArgs args)
{
var oldLoginName = _document.LoginName.Replace(" ", "").ToLower();
var newLoginName = MemberLoginNameTxt.Text.Replace(" ", "").ToLower();
if (oldLoginName != newLoginName && newLoginName != "" && Member.GetMemberFromLoginName(newLoginName) != null)
args.IsValid = false;
else
args.IsValid = true;
}
void MemberEmailExistCheck_ServerValidate(object source, ServerValidateEventArgs args)
{
var oldEmail = _document.Email.ToLower();
var newEmail = MemberEmail.Text.ToLower();