lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#20689 Reverting previous changes and jsut forcing validation if author is null when user is not signed in

Browse Source
This commit is contained in:
Nicholas Mayne
2014-05-12 21:09:14 +01:00
parent e1eebc200b
commit 4525650ffa
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
View File

@@ -106,7 +106,11 @@ namespace Orchard.Comments.Drivers {
var currentUser = workContext.CurrentUser;
part.UserName = (currentUser != null ? currentUser.UserName : null);
if (currentUser != null) part.Author = currentUser.UserName;
if (currentUser != null)
part.Author = currentUser.UserName;
else if (string.IsNullOrWhiteSpace(part.Author)) {
updater.AddModelError("Comments.Author", T("Name is mandatory"));
}
var moderateComments = workContext.CurrentSite.As<CommentSettingsPart>().ModerateComments;
part.Status = moderateComments ? CommentStatus.Pending : CommentStatus.Approved;

4
src/Orchard.Web/Modules/Orchard.Comments/Models/CommentPart.cs
View File

@@ -12,7 +12,7 @@ namespace Orchard.Comments.Models {
public LazyField<ContentItem> CommentedOnContentItemField { get { return _commentedOnContentItem; } }
public LazyField<ContentItemMetadata> CommentedOnContentItemMetadataField { get { return _commentedOnContentItemMetadata; } }
[Required, StringLength(255)]
[StringLength(255)]
public string Author {
get { return Record.Author; }
set { Record.Author = value; }
@@ -31,7 +31,7 @@ namespace Orchard.Comments.Models {
set { Record.UserName = value; }
}
[Required, RegularExpression(@"^(?![\.@])(""([^""\r\\]|\\[""\r\\])*""|([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)@[a-z0-9][\w\.-]*[a-z0-9]\.[a-z][a-z\.]*[a-z]$")]
[RegularExpression(@"^(?![\.@])(""([^""\r\\]|\\[""\r\\])*""|([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)@[a-z0-9][\w\.-]*[a-z0-9]\.[a-z][a-z\.]*[a-z]$")]
public string Email {
get { return Record.Email; }
set { Record.Email = value; }

6
src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comment.cshtml
View File

@@ -7,11 +7,11 @@
<ol>
<li>
@Html.LabelFor(m => m.Author, T("Name"))
@Html.TextBoxFor(m => m.Author, new { required = "required" })
@Html.TextBoxFor(m => m.Author)
</li>
<li>
@Html.LabelFor(m => m.Email, T("Email"))
@Html.TextBoxFor(m => m.Email, new { required = "required" })
@Html.TextBoxFor(m => m.Email)
</li>
<li>
@Html.LabelFor(m => m.SiteName, T("Url"))
@@ -21,7 +21,7 @@
</fieldset>
}
else {
@Html.Hidden("Author", WorkContext.CurrentUser.UserName ?? "")
@Html.Hidden("Name", WorkContext.CurrentUser.UserName ?? "")
@Html.Hidden("Email", WorkContext.CurrentUser.Email ?? "")
}