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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Added the ability to create and edit new permissions in the admin panel
supporte2b6494b6a0c
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Create.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Create.cshtmlnew file mode 100644index 000000000..b946136c6--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Create.cshtml@@ -0,0 +1,94 @@+@model PermissionCreateModel+@{+ Layout = "";+ //page title+ ViewBag.Title = Loc["Admin.Configuration.Permissions.AddNew"];+}+<form id="PermissionPopup" asp-area="@Constants.AreaAdmin" asp-controller="Permission" asp-action="Create" method="post">++ <div asp-validation-summary="All"></div>++ <div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-cubes"></i>+ <text> @Loc["Admin.Configuration.Permissions.AddNew"]</text>+ </div>+ </div>+ <div class="x_content form">+ <div class="form-horizontal">+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="Name" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Name" />+ <span asp-validation-for="Name"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="SystemName" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="SystemName" />+ <span asp-validation-for="SystemName"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="Area" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Area" />+ <span asp-validation-for="Area"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="Category" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Category" />+ <span asp-validation-for="Category"></span>+ </div>+ </div>++ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#PermissionPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ location.reload();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script>+</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtmlindex bc023d86c..9ffda65a6 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml@@ -14,6 +14,7 @@@Loc["Admin.Configuration.Permissions"]</div><div class="actions">+ <a href="@Url.Action("Create", new { area = Constants.AreaAdmin })" class="btn green" id="btnAddNewPermission"><i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span></a><button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div><vc:admin-widget widget-zone="permission_list_buttons" additional-data="null" />@@ -33,7 +34,7 @@}else{- <script>+ <script>function checkCategory(checkbox) {var cbox = checkbox;var input = $(checkbox).closest("td").find("ul input");@@ -56,66 +57,66 @@<div class="table-responsive"><table class="table table-bordered tableFixHead permissions-table"><thead>- <tr>- <th class="first-th" scope="col">- <div class="d-flex justify-content-center align-items-center">- <strong>@Loc["Admin.Configuration.Permissions.Permission"]</strong>+ <tr>+ <th class="first-th" scope="col">+ <div class="d-flex justify-content-center align-items-center">+ <strong>@Loc["Admin.Configuration.Permissions.Permission"]</strong>+ </div>+ </th>+ @foreach (var cr in Model.AvailableCustomerGroups)+ {+ <th scope="col">+ <div class="d-flex flex-column align-items-center justify-content-center">+ <strong>@cr.Name</strong>+ <label class='mt-checkbox mt-checkbox-outline control control-checkbox no-action'><input type="checkbox" id="selectall-@(cr.Id)" /> <div class="control__indicator"></div></label></div></th>- @foreach (var cr in Model.AvailableCustomerGroups)- {- <th scope="col">- <div class="d-flex flex-column align-items-center justify-content-center">- <strong>@cr.Name</strong>- <label class='mt-checkbox mt-checkbox-outline control control-checkbox no-action'><input type="checkbox" id="selectall-@(cr.Id)" /> <div class="control__indicator"></div></label>- </div>- </th>- }- </tr>+ }+ </tr></thead><tbody>- @{- var altRow = true;- var group = Model.AvailablePermissions.GroupBy(x => x.Category);- }- @foreach (var pr in group)- {- altRow = !altRow;+ @{+ var altRow = true;+ var group = Model.AvailablePermissions.GroupBy(x => x.Category);+ }+ @foreach (var pr in group)+ {+ altRow = !altRow;- <tr class="@(altRow ? "altrowstyle" : "rowstyle")">- <td>- @{- var groupList = pr.ToList();+ <tr class="@(altRow ? "altrowstyle" : "rowstyle")">+ <td>+ @{+ var groupList = pr.ToList();+ }+ <button type="button" class="btn btn-info title" data-toggle="collapse" data-target=".multi-collapse-@groupList[0].Category" aria-expanded="true" aria-controls="@groupList[0].Category-collapseMain">@groupList[0].Category <i class="fa fa-chevron-down" aria-hidden="true"></i></button>+ <ul id="@groupList[0].Category-collapseMain" class="collapse show multi-collapse-@groupList[0].Category">+ @foreach (var item in groupList)+ {+ <li>+ <a class="btnUpdatePermission" href="@Url.Action("Update", new { area = Constants.AreaAdmin, SystemName = @item.SystemName })">@item.Name</a>+ </li>}- <button type="button" class="btn btn-info title" data-toggle="collapse" data-target=".multi-collapse-@groupList[0].Category" aria-expanded="true" aria-controls="@groupList[0].Category-collapseMain">@groupList[0].Category <i class="fa fa-chevron-down" aria-hidden="true"></i></button>- <ul id="@groupList[0].Category-collapseMain" class="collapse show multi-collapse-@groupList[0].Category">+ </ul>+ </td>+ @foreach (var cr in Model.AvailableCustomerGroups)+ {+ <td class="checkbox-container">+ <div class="title">+ <span>@cr.Name</span>+ <label class='mt-checkbox mt-checkbox-outline control control-checkbox no-action'><input type="checkbox" onclick="checkCategory(this)" /> <div class="control__indicator"></div></label>+ </div>+ <ul class="collapse show multi-collapse-@groupList[0].Category">@foreach (var item in groupList){+ var allowed = Model.Allowed.ContainsKey(item.SystemName) && Model.Allowed[item.SystemName][cr.Id];<li>- <span>@item.Name</span>- </li>- }- </ul>- </td>- @foreach (var cr in Model.AvailableCustomerGroups)- {- <td class="checkbox-container">- <div class="title">- <span>@cr.Name</span>- <label class='mt-checkbox mt-checkbox-outline control control-checkbox no-action'><input type="checkbox" onclick="checkCategory(this)" /> <div class="control__indicator"></div></label>- </div>- <ul class="collapse show multi-collapse-@groupList[0].Category">- @foreach (var item in groupList)- {- var allowed = Model.Allowed.ContainsKey(item.SystemName) && Model.Allowed[item.SystemName][cr.Id];- <li>- <label class='mt-checkbox mt-checkbox-outline control control-checkbox @if (!item.Actions) { <text>no-action</text> }'><input class="allow_@(cr.Id)" type="checkbox" value="@(item.SystemName)" name="allow_@(cr.Id)" @(allowed ? " checked=checked" : null) /> <div class="control__indicator"></div></label>- @if (item.Actions)- {- <a class='k-link permissionlink'- href="@Url.Action("PermissionsAction", "Permission", new { area = Constants.AreaAdmin })/?systemname=@(item.SystemName)&[email protected]"><i class="icon-settings"></i></a>- <script>+ <label class='mt-checkbox mt-checkbox-outline control control-checkbox @if (!item.Actions) { <text>no-action</text> }'><input class="allow_@(cr.Id)" type="checkbox" value="@(item.SystemName)" name="allow_@(cr.Id)" @(allowed ? " checked=checked" : null) /> <div class="control__indicator"></div></label>+ @if (item.Actions)+ {+ <a class='k-link permissionlink'+ href="@Url.Action("PermissionsAction", "Permission", new { area = Constants.AreaAdmin })/?systemname=@(item.SystemName)&[email protected]"><i class="icon-settings"></i></a>+ <script>$(document).ready(function () {$('.permissionlink').magnificPopup({type: 'ajax',@@ -132,14 +133,14 @@});});</script>- }- </li>- }- </ul>- </td>- }- </tr>- }+ }+ </li>+ }+ </ul>+ </td>+ }+ </tr>+ }</tbody></table></div>@@ -153,4 +154,36 @@</div></div></div>-</form>\ No newline at end of file+</form>+++<script>+ $(document).ready(function () {+ $('#btnAddNewPermission').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ midClick: true,+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ $('.btnUpdatePermission').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ midClick: true,+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ });+</script>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Update.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Update.cshtmlnew file mode 100644index 000000000..9903d773a--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Update.cshtml@@ -0,0 +1,92 @@+@model PermissionUpdateModel+@{+ Layout = "";+ //page title+ ViewBag.Title = Loc["Admin.Configuration.Permissions.AddNew"];+}+<form id="PermissionPopup" asp-area="@Constants.AreaAdmin" asp-controller="Permission" asp-action="Update" method="post">+ <div asp-validation-summary="All"></div>+ <input asp-for="Id" type="hidden" />+ <div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-cubes"></i>+ <text> @Loc["Admin.Configuration.Permissions.Update"] @Model.SystemName</text>+ </div>+ </div>+ <div class="x_content form">+ <div class="form-horizontal">+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="Name" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Name" />+ <span asp-validation-for="Name"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="SystemName" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="SystemName" asp-disabled="true" />+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="Area" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Area" />+ <span asp-validation-for="Area"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="Category" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Category" />+ <span asp-validation-for="Category"></span>+ </div>+ </div>++ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#PermissionPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ location.reload();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script>+</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs b/src/Web/Grand.Web.Admin/Controllers/PermissionController.csindex 87b22df59..47e74822b 100644--- a/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs@@ -1,15 +1,15 @@-using Grand.Business.Core.Extensions;+using DotLiquid.Util;+using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Business.Core.Interfaces.Common.Logging;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Utilities.Common.Security;using Grand.Web.Common.Models;using Grand.Web.Common.Security.Authorization;using Grand.Domain.Permissions;using Grand.Infrastructure;+using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Models.Permissions;-using MediatR;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Admin.Controllers@@ -19,31 +19,24 @@ namespace Grand.Web.Admin.Controllers{#region Fields- private readonly ILogger _logger;private readonly IWorkContext _workContext;private readonly IPermissionService _permissionService;private readonly IGroupService _groupService;private readonly ITranslationService _translationService;- private readonly IMediator _mediator;#endregion#region Constructors- public PermissionController(- ILogger logger,- IWorkContext workContext,+ public PermissionController(IWorkContext workContext,IPermissionService permissionService,IGroupService groupService,- ITranslationService translationService,- IMediator mediator)+ ITranslationService translationService){- _logger = logger;_workContext = workContext;_permissionService = permissionService;_groupService = groupService;_translationService = translationService;- _mediator = mediator;}#endregion@@ -84,6 +77,42 @@ namespace Grand.Web.Admin.Controllersreturn View(model);}+ public IActionResult Create()+ {+ return View(new PermissionCreateModel() { Area = "Area admin" });+ }++ [HttpPost]+ public async Task<IActionResult> Create(PermissionCreateModel model)+ {+ if (!ModelState.IsValid) return View(model);++ var permission = model.ToEntity();+ await _permissionService.InsertPermission(permission);+ return Content("");+ }++ public async Task<IActionResult> Update(string systemName)+ {+ if(string.IsNullOrEmpty(systemName)) return Content("SystemName is null");++ var permission = await _permissionService.GetPermissionBySystemName(systemName);+ if (permission == null) return Content("Permission not found");+ PermissionUpdateModel model = permission.ToModel();+ return View(model);+ }++ [HttpPost]+ public async Task<IActionResult> Update(PermissionUpdateModel model)+ {+ if (!ModelState.IsValid) return View(model);++ var permission = await _permissionService.GetPermissionById(model.Id);+ permission = model.ToEntity(permission);+ await _permissionService.UpdatePermission(permission);+ return Content("");+ }+[HttpPost, ActionName("Index")]public async Task<IActionResult> PermissionsSave(IDictionary<string, string[]> model){diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/PermissionMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/PermissionMappingExtensions.csnew file mode 100644index 000000000..0350f41ae--- /dev/null+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/PermissionMappingExtensions.cs@@ -0,0 +1,24 @@+using Grand.Domain.Permissions;+using Grand.Infrastructure.Mapper;+using Grand.Web.Admin.Models.Permissions;++namespace Grand.Web.Admin.Extensions.Mapping+{+ public static class PermissionMappingExtensions+ {+ public static Permission ToEntity(this PermissionCreateModel model)+ {+ return model.MapTo<PermissionCreateModel, Permission>();+ }++ public static PermissionUpdateModel ToModel(this Permission entity)+ {+ return entity.MapTo<Permission, PermissionUpdateModel>();+ }++ public static Permission ToEntity(this PermissionUpdateModel model, Permission destination)+ {+ return model.MapTo(destination);+ }+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Mapper/PermissionProfile.cs b/src/Web/Grand.Web.Admin/Mapper/PermissionProfile.csnew file mode 100644index 000000000..2e3117376--- /dev/null+++ b/src/Web/Grand.Web.Admin/Mapper/PermissionProfile.cs@@ -0,0 +1,23 @@+using AutoMapper;+using Grand.Domain.Permissions;+using Grand.Infrastructure.Mapper;+using Grand.Web.Admin.Models.Permissions;++namespace Grand.Web.Admin.Mapper;++public class PermissionProfile : Profile, IAutoMapperProfile+{+ public PermissionProfile()+ {+ CreateMap<PermissionCreateModel, Permission>();+ CreateMap<PermissionUpdateModel, Permission>()+ .ForMember(dest => dest.Id, mo => mo.Ignore())+ .ForMember(dest => dest.SystemName, mo => mo.Ignore())+ .ForMember(dest => dest.Actions, mo => mo.Ignore())+ .ForMember(dest => dest.CustomerGroups, mo => mo.Ignore());++ CreateMap<Permission, PermissionUpdateModel>();+ }++ public int Order => 0;+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Models/Permissions/PermissionCreateModel.cs b/src/Web/Grand.Web.Admin/Models/Permissions/PermissionCreateModel.csnew file mode 100644index 000000000..710339eb0--- /dev/null+++ b/src/Web/Grand.Web.Admin/Models/Permissions/PermissionCreateModel.cs@@ -0,0 +1,31 @@+using Grand.Infrastructure.ModelBinding;+using Grand.Infrastructure.Models;++namespace Grand.Web.Admin.Models.Permissions;++public class PermissionCreateModel : BaseModel+{+ /// <summary>+ /// Gets or sets the permission name+ /// </summary>+ [GrandResourceDisplayName("Admin.Configuration.Permissions.Fields.Name")]+ public string Name { get; set; }++ /// <summary>+ /// Gets or sets the permission system name+ /// </summary>+ [GrandResourceDisplayName("Admin.Configuration.Permissions.Fields.SystemName")]+ public string SystemName { get; set; }++ /// <summary>+ /// Gets or sets the area name+ /// </summary>+ [GrandResourceDisplayName("Admin.Configuration.Permissions.Fields.Area")]+ public string Area { get; set; }++ /// <summary>+ /// Gets or sets the permission category+ /// </summary>+ [GrandResourceDisplayName("Admin.Configuration.Permissions.Fields.Category")]+ public string Category { get; set; }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Models/Permissions/PermissionUpdateModel.cs b/src/Web/Grand.Web.Admin/Models/Permissions/PermissionUpdateModel.csnew file mode 100644index 000000000..0c819e4ea--- /dev/null+++ b/src/Web/Grand.Web.Admin/Models/Permissions/PermissionUpdateModel.cs@@ -0,0 +1,31 @@+using Grand.Infrastructure.ModelBinding;+using Grand.Infrastructure.Models;++namespace Grand.Web.Admin.Models.Permissions;++public class PermissionUpdateModel : BaseEntityModel+{+ /// <summary>+ /// Gets or sets the permission name+ /// </summary>+ [GrandResourceDisplayName("Admin.Configuration.Permissions.Fields.Name")]+ public string Name { get; set; }++ /// <summary>+ /// Gets or sets the permission system name+ /// </summary>+ [GrandResourceDisplayName("Admin.Configuration.Permissions.Fields.SystemName")]+ public string SystemName { get; set; }++ /// <summary>+ /// Gets or sets the area name+ /// </summary>+ [GrandResourceDisplayName("Admin.Configuration.Permissions.Fields.Area")]+ public string Area { get; set; }++ /// <summary>+ /// Gets or sets the permission category+ /// </summary>+ [GrandResourceDisplayName("Admin.Configuration.Permissions.Fields.Category")]+ public string Category { get; set; }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Validators/Permission/PermissionCreateModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Permission/PermissionCreateModelValidator.csnew file mode 100644index 000000000..03ceb5ac2--- /dev/null+++ b/src/Web/Grand.Web.Admin/Validators/Permission/PermissionCreateModelValidator.cs@@ -0,0 +1,30 @@+using FluentValidation;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Common.Security;+using Grand.Infrastructure.Validators;+using Grand.Web.Admin.Models.Permissions;++namespace Grand.Web.Admin.Validators.Permission+{+ public class PermissionCreateModelValidator : BaseGrandValidator<PermissionCreateModel>+ {+ public PermissionCreateModelValidator(+ IEnumerable<IValidatorConsumer<PermissionCreateModel>> validators,+ IPermissionService permissionService,+ ITranslationService translationService)+ : base(validators)+ {+ RuleFor(x => x.Name).NotEmpty().WithMessage(translationService.GetResource("Admin.Permissions.Fields.Name.Required"));+ RuleFor(x => x.SystemName).NotEmpty().WithMessage(translationService.GetResource("Admin.Permissions.Fields.SystemName.Required"));+ RuleFor(x => x.Area).NotEmpty().WithMessage(translationService.GetResource("Admin.Permissions.Fields.Area.Required"));+ RuleFor(x => x.Category).NotEmpty().WithMessage(translationService.GetResource("Admin.Permissions.Fields.Category.Required"));+ RuleFor(x => x.SystemName).CustomAsync(async (x, context, _) =>+ {+ var permissionBySystemName = await permissionService.GetPermissionBySystemName(x);+ if(permissionBySystemName!=null)+ context.AddFailure(translationService.GetResource("Admin.Permissions.Fields.SystemName.Exist"));+ });++ }+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Validators/Permission/PermissionUpdateModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Permission/PermissionUpdateModelValidator.csnew file mode 100644index 000000000..a6a31dd16--- /dev/null+++ b/src/Web/Grand.Web.Admin/Validators/Permission/PermissionUpdateModelValidator.cs@@ -0,0 +1,31 @@+using FluentValidation;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Common.Security;+using Grand.Infrastructure.Validators;+using Grand.Web.Admin.Models.Permissions;++namespace Grand.Web.Admin.Validators.Permission+{+ public class PermissionUpdateModelValidator : BaseGrandValidator<PermissionUpdateModel>+ {+ public PermissionUpdateModelValidator(+ IEnumerable<IValidatorConsumer<PermissionUpdateModel>> validators,+ IPermissionService permissionService,+ ITranslationService translationService)+ : base(validators)+ {+ RuleFor(x => x.Name).NotEmpty()+ .WithMessage(translationService.GetResource("Admin.Permissions.Fields.Name.Required"));+ RuleFor(x => x.Area).NotEmpty()+ .WithMessage(translationService.GetResource("Admin.Permissions.Fields.Area.Required"));+ RuleFor(x => x.Category).NotEmpty()+ .WithMessage(translationService.GetResource("Admin.Permissions.Fields.Category.Required"));+ RuleFor(x => x.Id).CustomAsync(async (x, context, _) =>+ {+ var permission = await permissionService.GetPermissionById(x);+ if (permission == null)+ context.AddFailure(translationService.GetResource("Admin.Permissions.Fields.Id.NotExist"));+ });+ }+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex b6a0365e8..b2e48138a 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -4938,6 +4938,24 @@<Resource Name="Admin.Configuration.Shipping.PickupPoint.Fields.Warehouses" Area="Admin"><Value>Select warehouse</Value></Resource>+ <Resource Name="admin.configuration.permissions.addnew" Area="Admin">+ <Value>Add new permission</Value>+ </Resource>+ <Resource Name="admin.configuration.permissions.fields.area" Area="Admin">+ <Value>Area</Value>+ </Resource>+ <Resource Name="admin.configuration.permissions.fields.category" Area="Admin">+ <Value>Category</Value>+ </Resource>+ <Resource Name="admin.configuration.permissions.fields.name" Area="Admin">+ <Value>Name</Value>+ </Resource>+ <Resource Name="admin.configuration.permissions.fields.systemName" Area="Admin">+ <Value>System name</Value>+ </Resource>+ <Resource Name="admin.configuration.permissions.update" Area="Admin">+ <Value>Update permission</Value>+ </Resource><Resource Name="admin.configuration.shipping.pickuppoint.selectstore" Area="Admin"><Value>Select store</Value></Resource>@@ -9300,6 +9318,21 @@<Resource Name="Admin.PaymentTransaction.Fields.VoidOffline" Area="Admin"><Value>Void offline</Value></Resource>+ <Resource Name="admin.permissions.fields.area.required" Area="Admin">+ <Value>Area is required.</Value>+ </Resource>+ <Resource Name="admin.permissions.fields.category.required" Area="Admin">+ <Value>Category is required.</Value>+ </Resource>+ <Resource Name="admin.permissions.fields.id.notexist" Area="Admin">+ <Value>Permission not exists.</Value>+ </Resource>+ <Resource Name="admin.permissions.fields.name.required" Area="Admin">+ <Value>Name is required.</Value>+ </Resource>+ <Resource Name="admin.permissions.fields.systemname.required" Area="Admin">+ <Value>System name is required.</Value>+ </Resource><Resource Name="Admin.Picture.RemovePicture" Area="Admin"><Value>Remove picture</Value></Resource>diff --git a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xml b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xmlnew file mode 100644index 000000000..ce7a84584--- /dev/null+++ b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xml@@ -0,0 +1,36 @@+<?xml version="1.0" encoding="utf-8"?>+<Language Name="English">+ <Resource Name="admin.permissions.fields.area.required" Area="Admin">+ <Value>Area is required.</Value>+ </Resource>+ <Resource Name="admin.permissions.fields.category.required" Area="Admin">+ <Value>Category is required.</Value>+ </Resource>+ <Resource Name="admin.permissions.fields.id.notexist" Area="Admin">+ <Value>Permission not exists.</Value>+ </Resource>+ <Resource Name="admin.permissions.fields.name.required" Area="Admin">+ <Value>Name is required.</Value>+ </Resource>+ <Resource Name="admin.permissions.fields.systemname.required" Area="Admin">+ <Value>System name is required.</Value>+ </Resource>+ <Resource Name="admin.configuration.permissions.addnew" Area="Admin">+ <Value>Add new permission</Value>+ </Resource>+ <Resource Name="admin.configuration.permissions.fields.area" Area="Admin">+ <Value>Area</Value>+ </Resource>+ <Resource Name="admin.configuration.permissions.fields.category" Area="Admin">+ <Value>Category</Value>+ </Resource>+ <Resource Name="admin.configuration.permissions.fields.name" Area="Admin">+ <Value>Name</Value>+ </Resource>+ <Resource Name="admin.configuration.permissions.fields.systemName" Area="Admin">+ <Value>System name</Value>+ </Resource>+ <Resource Name="admin.configuration.permissions.update" Area="Admin">+ <Value>Update permission</Value>+ </Resource>+</Language>\ No newline at end of file