Added validation for empty comment in knowledgebase article - #456

PatrykPorabik · PatrykPorabik · commit 34e94336364b · 2019-02-15T09:09:50.000+01:00
diff --git a/Grand.Web/App_Data/Localization/Upgrade/EN_430_440.nopres.xml b/Grand.Web/App_Data/Localization/Upgrade/EN_430_440.nopres.xml
@@ -527,4 +527,7 @@
   <LocaleResource Name="Blog.SearchPlaceholder">
     <Value>Search in blog...</Value>
   </LocaleResource>
+  <LocaleResource Name="Grand.Knowledgebase.AddArticleComment.Result">
+    <Value>Enter the comment</Value>
+  </LocaleResource>
 </Language>
diff --git a/Grand.Web/App_Data/Localization/defaultResources.grandres.xml b/Grand.Web/App_Data/Localization/defaultResources.grandres.xml
@@ -17131,6 +17131,9 @@
   <LocaleResource Name="GiftCardAttribute.From.Virtual">
     <Value><![CDATA[From: {0} <{1}>]]></Value>
   </LocaleResource>
+  <LocaleResource Name="Grand.Knowledgebase.AddArticleComment.Result">
+    <Value>Enter the comment</Value>
+  </LocaleResource>
   <LocaleResource Name="HomePage">
     <Value>Home page</Value>
   </LocaleResource>
diff --git a/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleModel.cs b/Grand.Web/Models/Knowledgebase/KnowledgebaseArticleModel.cs
@@ -1,8 +1,11 @@
-﻿using Grand.Framework.Mvc.Models;
+﻿using FluentValidation.Attributes;
+using Grand.Framework.Mvc.Models;
+using Grand.Web.Validators.Knowledgebase;
 using System.Collections.Generic;
 
 namespace Grand.Web.Models.Knowledgebase
 {
+    [Validator(typeof(KnowledgebaseArticleValidator))]
     public class KnowledgebaseArticleModel : BaseGrandEntityModel
     {
         public KnowledgebaseArticleModel()
diff --git a/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs b/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs
@@ -0,0 +1,15 @@
+﻿using FluentValidation;
+using Grand.Framework.Validators;
+using Grand.Services.Localization;
+using Grand.Web.Models.Knowledgebase;
+
+namespace Grand.Web.Validators.Knowledgebase
+{
+    public class KnowledgebaseArticleValidator : BaseGrandValidator<KnowledgebaseArticleModel>
+    {
+        public KnowledgebaseArticleValidator(ILocalizationService localizationService)
+        {
+            RuleFor(x => x.AddNewComment.CommentText).NotEmpty().WithMessage(localizationService.GetResource("Grand.knowledgebase.addarticlecomment.result")).When(x => x.AddNewComment != null);
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,11 @@`
`1`		`-using Grand.Framework.Mvc.Models;`
	`1`	`+using FluentValidation.Attributes;`
	`2`	`+using Grand.Framework.Mvc.Models;`
	`3`	`+using Grand.Web.Validators.Knowledgebase;`
`2`	`4`	`using System.Collections.Generic;`
`3`	`5`
`4`	`6`	`namespace Grand.Web.Models.Knowledgebase`
`5`	`7`	`{`
	`8`	`+ [Validator(typeof(KnowledgebaseArticleValidator))]`
`6`	`9`	`public class KnowledgebaseArticleModel : BaseGrandEntityModel`
`7`	`10`	`{`
`8`	`11`	`public KnowledgebaseArticleModel()`