From 751935db456de6893b3c2a669e7b3abacd1e331f Mon Sep 17 00:00:00 2001
From: Alper Ebicoglu <alperonline@hotmail.com>
Date: Fri, 29 Dec 2017 11:51:58 +0300
Subject: [PATCH] Added role edit dialog

---
 .../AbpIdentityWebAutoMapperProfile.cs        |  5 +++
 .../Pages/Identity/Roles/EditModal.cshtml     | 37 +++++++++++++++++++
 .../Pages/Identity/Roles/EditModal.cshtml.cs  | 29 +++++++++++++++
 .../Pages/Identity/Roles/RoleInfoModel.cs     | 17 +++++++++
 .../Volo.Abp.Identity.Web.csproj              |  1 +
 5 files changed, 89 insertions(+)
 create mode 100644 src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
 create mode 100644 src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs
 create mode 100644 src/Volo.Abp.Identity.Web/Pages/Identity/Roles/RoleInfoModel.cs

diff --git a/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs b/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs
index fb96c8c07d..0b0027cc7a 100644
--- a/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs
+++ b/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs
@@ -1,5 +1,7 @@
 using AutoMapper;
+using Volo.Abp.Identity.Web.Pages.Identity.Roles;
 using Volo.Abp.Identity.Web.Pages.Identity.Users;
+using EditModalModel = Volo.Abp.Identity.Web.Pages.Identity.Users.EditModalModel;
 
 namespace Volo.Abp.Identity.Web.ObjectMappings
 {
@@ -17,6 +19,9 @@ namespace Volo.Abp.Identity.Web.ObjectMappings
             CreateMap<IdentityRoleDto, EditModalModel.AssignedRoleViewModel>()
                 .ForMember(dest => dest.IsAssigned, opt => opt.Ignore());
 
+            CreateMap<IdentityRoleDto, RoleInfoModel>();
+
+
             //CreateModal
 
             CreateMap<CreateModalModel.UserInfoViewModel, IdentityUserCreateDto>()
diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
new file mode 100644
index 0000000000..ae54404e60
--- /dev/null
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
@@ -0,0 +1,37 @@
+@page
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.Identity.Web.Localization.Resources.AbpIdentity
+@model Volo.Abp.Identity.Web.Pages.Identity.Roles.EditModalModel
+@inject IStringLocalizer<IdentityResource> L
+@{
+    Layout = null;
+}
+
+<form method="post" asp-page="/Identity/Roles/EditModal">
+
+    <abp-modal>
+
+        <abp-modal-header title="@L["Edit"]"></abp-modal-header>
+
+        <abp-modal-body>
+
+                <div class="tab-pane active" id="EditUser_UserInfoTab" role="tabpanel">
+
+                    <input asp-for="RoleInfo.Id" />
+
+                    <div class="form-group">
+                        <label asp-for="RoleInfo.Name"></label>
+                        <input asp-for="RoleInfo.Name" class="form-control" />
+                        <span asp-validation-for="RoleInfo.Name" class="text-danger"></span>
+                    </div>
+                </div>
+
+            <div asp-validation-summary="All" class="text-danger"></div>
+
+        </abp-modal-body>
+
+        <abp-modal-footer></abp-modal-footer>
+
+    </abp-modal>
+
+</form>
\ No newline at end of file
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
new file mode 100644
index 0000000000..9fe26e56be
--- /dev/null
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.RazorPages;
+
+namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
+{
+    public class EditModalModel : AbpPageModel
+    {
+        [BindProperty]
+        public RoleInfoModel RoleInfo { get; set; }
+
+        private readonly IIdentityRoleAppService _identityRoleAppService;
+
+        public EditModalModel(IIdentityRoleAppService identityRoleAppService)
+        {
+            _identityRoleAppService = identityRoleAppService;
+        }
+
+        public async Task OnGetAsync(Guid id)
+        {
+            var role = await _identityRoleAppService.GetAsync(id);
+            RoleInfo =  ObjectMapper.Map<IdentityRoleDto, RoleInfoModel>(role);
+        }
+
+        
+
+    }
+}
\ 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
new file mode 100644
index 0000000000..25d4b8d2d2
--- /dev/null
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/RoleInfoModel.cs
@@ -0,0 +1,17 @@
+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
diff --git a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
index 673975282b..a639cf9db1 100644
--- a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
+++ b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Remove="Pages\Identity\Roles\EditModal.cshtml" />
     <Content Remove="Pages\Identity\Roles\Index.cshtml" />
   </ItemGroup>