Admin panel - Minor fix KnowledgebaseCategoryModelValidator

grandnode · Sep 27, 2021 · d1944a3 · d1944a3
1 parent 17f6815
commit d1944a3
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs
@@ -18,21 +18,19 @@ public class KnowledgebaseCategoryModelValidator : BaseGrandValidator<Knowledgeb
             RuleFor(x => x.Name).NotEmpty().WithMessage(translationService.GetResource("Admin.Content.Knowledgebase.KnowledgebaseCategory.Fields.Name.Required"));
             RuleFor(x => x.ParentCategoryId).MustAsync(async (x, y, context) =>
             {
-                var category = await knowledgebaseService.GetKnowledgebaseCategory(x.ParentCategoryId);
-                if (category != null || string.IsNullOrEmpty(x.ParentCategoryId))
+                if (!string.IsNullOrEmpty(x.ParentCategoryId))
                 {
-                    return true;
-                }
-                else
-                {
-                    var categories = await knowledgebaseService.GetKnowledgebaseCategories();
-                    if (!categories.Any())
+                    if (x.Id == x.ParentCategoryId)
+                        return false;
+
+                    var category = await knowledgebaseService.GetKnowledgebaseCategory(x.ParentCategoryId);
+                    if (category == null)
                     {
-                        return true;
+                        return false;
                     }
                 }
 
-                return false;
+                return true;
             }).WithMessage(translationService.GetResource("Admin.Content.Knowledgebase.KnowledgebaseCategory.Fields.ParentCategoryId.MustExist"));
         }
     }