paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid spaces in user names

Browse Source 
[TODO] fix identity config
This commit is contained in:
Paul Schneider
2019-07-21 17:35:41 +02:00
parent 7143c1feeb
commit 4013d7f248
7 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Yavsc.Abstract/Attributes/Validation/YaRegularExpression.cs
View File

@ -7,11 +7,14 @@ namespace Yavsc.Attributes.Validation
public class YaRegularExpression : System.ComponentModel.DataAnnotations.RegularExpressionAttribute {
public YaRegularExpression(string pattern): base (pattern)
{
this.ErrorMessage = pattern;
this.ErrorMessage = "RegularExpression: "+ pattern;
}
public override string FormatErrorMessage(string name)
{
if (ErrorMessageResourceType==null || string.IsNullOrEmpty(ErrorMessageResourceName))
return ErrorMessage;
var prop = this.ErrorMessageResourceType.GetProperty(ErrorMessageResourceName);
return (string) prop.GetValue(null, BindingFlags.Static, null, null, System.Globalization.CultureInfo.CurrentUICulture);

1
src/Yavsc.Abstract/Attributes/Validation/YaStringLength.cs
View File

@ -51,7 +51,6 @@ namespace Yavsc.Attributes.Validation
}
public override string FormatErrorMessage(string name)
{
var temp = base.FormatErrorMessage(name);
return string.Format(temp, MinimumLength, maxLen);
}

2
src/Yavsc.Abstract/Attributes/Validation/YaValidationAttribute.cs
View File

@ -36,7 +36,9 @@ namespace Yavsc.Attributes.Validation
public override string FormatErrorMessage(string name)
{
if (ErrorMessageResourceType == null) // failed :/
{
return base.FormatErrorMessage(name);
}
if (ErrorMessageResourceName == null) // re failed :/
return base.FormatErrorMessage(name);