diff --git a/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs b/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs index 7b5122c499..ada2fa3235 100644 --- a/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs +++ b/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs @@ -36,14 +36,13 @@ namespace Volo.Abp.Identity.Web.ObjectMappings private void CreateRoleMappings() { //List - CreateMap(); + CreateMap(); //CreateModal - CreateMap(); + CreateMap(); //EditModal - CreateMap(); + CreateMap(); } - } } diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs index f4efcb12a7..23fea2c814 100644 --- a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs +++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs @@ -8,27 +8,27 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Roles public class CreateModalModel : AbpPageModel { [BindProperty] - public CreateRoleInfoModel RoleModel { get; set; } + public RoleInfoModel RoleModel { get; set; } private readonly IIdentityRoleAppService _identityRoleAppService; public CreateModalModel(IIdentityRoleAppService identityRoleAppService) { _identityRoleAppService = identityRoleAppService; - RoleModel = new CreateRoleInfoModel(); + RoleModel = new RoleInfoModel(); } public async Task OnPostAsync() { ValidateModel(); - var input = ObjectMapper.Map(RoleModel); + var input = ObjectMapper.Map(RoleModel); await _identityRoleAppService.CreateAsync(input); return NoContent(); } - public class CreateRoleInfoModel + public class RoleInfoModel { [Required] [StringLength(IdentityRoleConsts.MaxNameLength)] diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs index 29d74108af..3ad82c16bf 100644 --- a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs +++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs @@ -1,4 +1,5 @@ using System; +using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.RazorPages; @@ -33,5 +34,16 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Roles return NoContent(); } + + public class RoleInfoModel + { + [HiddenInput] + public Guid Id { get; set; } + + [Required] + [StringLength(IdentityRoleConsts.MaxNameLength)] + [Display(Name = "RoleName")] + public string Name { get; set; } + } } } \ No newline at end of file diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/RoleInfoModel.cs b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/RoleInfoModel.cs deleted file mode 100644 index 25d4b8d2d2..0000000000 --- a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/RoleInfoModel.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using Microsoft.AspNetCore.Mvc; - -namespace Volo.Abp.Identity.Web.Pages.Identity.Roles -{ - public class RoleInfoModel - { - [HiddenInput] - public Guid Id { get; set; } - - [Required] - [StringLength(IdentityRoleConsts.MaxNameLength)] - [Display(Name = "RoleName")] - public string Name { get; set; } - } -} \ No newline at end of file