Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Admin panel - ContactAttributeController.cs - changes with validators

support51fadd0b54a6
diff --git a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
index ff00750d6..03f297f2e 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
@@ -219,18 +219,9 @@ namespace Grand.Web.Admin.Controllers
if (contactAttribute == null)
//No contact attribute found with the specified id
return RedirectToAction("List");
-
- if (contactAttribute.AttributeControlType == AttributeControlType.ColorSquares)
- {
- //ensure valid color is chosen/entered
- if (string.IsNullOrEmpty(model.ColorSquaresRgb))
- ModelState.AddModelError("", "Color is required");
- }
-
if (ModelState.IsValid)
{
await _contactAttributeViewModelService.InsertContactAttributeValueModel(contactAttribute, model);
-
return Content("");
}
@@ -269,13 +260,6 @@ namespace Grand.Web.Admin.Controllers
//No contact attribute value found with the specified id
return RedirectToAction("List");
- if (contactAttribute.AttributeControlType == AttributeControlType.ColorSquares)
- {
- //ensure valid color is chosen/entered
- if (string.IsNullOrEmpty(model.ColorSquaresRgb))
- ModelState.AddModelError("", "Color is required");
- }
-
if (ModelState.IsValid)
{
await _contactAttributeViewModelService.UpdateContactAttributeValueModel(contactAttribute, cav, model);
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs
index 7238b8e77..a64a26605 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs
@@ -1,6 +1,8 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Domain.Catalog;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
@@ -9,10 +11,20 @@ namespace Grand.Web.Admin.Validators.Messages
{
public ContactAttributeValueValidator(
IEnumerable<IValidatorConsumer<ContactAttributeValueModel>> validators,
+ IContactAttributeService contactAttributeService,
ITranslationService translationService)
: base(validators)
{
RuleFor(x => x.Name).NotEmpty().WithMessage(translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Values.Fields.Name.Required"));
+ RuleFor(x => x).CustomAsync(async (x, context, _) =>
+ {
+ var contactAttribute = await contactAttributeService.GetContactAttributeById(x.ContactAttributeId);
+ if (contactAttribute is { AttributeControlType: AttributeControlType.ColorSquares }
+ && string.IsNullOrEmpty(x.ColorSquaresRgb))
+ {
+ context.AddFailure("Color is required");
+ }
+ });
}
}
}
\ No newline at end of file