From e1eebc200b13d35f63d30434286b47f5a0424f00 Mon Sep 17 00:00:00 2001
From: Nicholas Mayne <Jetski5822@gmail.com>
Date: Sun, 11 May 2014 22:36:43 +0100
Subject: [PATCH] #20689 Adding required attributes for HTML and model

---
 .../Orchard.Comments/Controllers/CommentController.cs       | 4 ++--
 .../Modules/Orchard.Comments/Models/CommentPart.cs          | 4 ++--
 .../Views/EditorTemplates/Parts.Comment.cshtml              | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
index f09cc9618..2ee89c27c 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
@@ -29,11 +29,11 @@ namespace Orchard.Comments.Controllers {
             var comment = Services.ContentManager.New<CommentPart>("Comment");
             var editorShape = Services.ContentManager.UpdateEditor(comment, this);
 
-            if (!ModelState.IsValidField("Comments.Author") && Services.WorkContext.CurrentUser == null) {
+            if (!ModelState.IsValidField("Comments.Author")) {
                 Services.Notifier.Error(T("Name is mandatory and must have less than 255 chars"));
             }
 
-            if (!ModelState.IsValidField("Comments.Email") && Services.WorkContext.CurrentUser == null) {
+            if (!ModelState.IsValidField("Comments.Email")) {
                 Services.Notifier.Error(T("Email is invalid or is longer than 255 chars"));
             }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentPart.cs b/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentPart.cs
index 4ef90c4ff..79b3d126f 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentPart.cs
@@ -12,7 +12,7 @@ namespace Orchard.Comments.Models {
         public LazyField<ContentItem> CommentedOnContentItemField { get { return _commentedOnContentItem; } }
         public LazyField<ContentItemMetadata> CommentedOnContentItemMetadataField { get { return _commentedOnContentItemMetadata; } }
 
-        [StringLength(255)]
+        [Required, 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; }
         }
 
-        [RegularExpression(@"^(?![\.@])(""([^""\r\\]|\\[""\r\\])*""|([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)@[a-z0-9][\w\.-]*[a-z0-9]\.[a-z][a-z\.]*[a-z]$")]
+        [Required, 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; }
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comment.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comment.cshtml
index 11be54050..acb54f1b0 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comment.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comment.cshtml
@@ -7,11 +7,11 @@
         <ol>
             <li>
                 @Html.LabelFor(m => m.Author, T("Name"))
-                @Html.TextBoxFor(m => m.Author)
+                @Html.TextBoxFor(m => m.Author, new { required = "required" })
             </li>
             <li>
                 @Html.LabelFor(m => m.Email, T("Email"))
-                @Html.TextBoxFor(m => m.Email)
+                @Html.TextBoxFor(m => m.Email, new { required = "required" })
             </li>
             <li>
                 @Html.LabelFor(m => m.SiteName, T("Url"))
@@ -21,7 +21,7 @@
     </fieldset>
 }
 else {
-    @Html.Hidden("Name", WorkContext.CurrentUser.UserName ?? "")
+    @Html.Hidden("Author", WorkContext.CurrentUser.UserName ?? "")
     @Html.Hidden("Email", WorkContext.CurrentUser.Email ?? "")
 }