From a709ce09a4c34d57bfb82b5f533a43a3edc2a052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 29 Dec 2017 15:01:22 +0300
Subject: [PATCH] Minor fixes.

---
 .../AbpIdentityWebAutoMapperProfile.cs            |  2 +-
 .../Pages/Identity/Roles/CreateModal.cshtml.cs    |  9 +++++++++
 .../Pages/Identity/Roles/CreateRoleInfoModel.cs   | 12 ------------
 .../Pages/Identity/Users/Index.cshtml             |  2 +-
 .../Volo.Abp.Identity.Web.csproj                  | 15 ---------------
 5 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateRoleInfoModel.cs

diff --git a/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs b/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs
index 6d05954565..7b5122c499 100644
--- a/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs
+++ b/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs
@@ -39,7 +39,7 @@ namespace Volo.Abp.Identity.Web.ObjectMappings
             CreateMap<IdentityRoleDto, RoleInfoModel>();
 
             //CreateModal
-            CreateMap<CreateRoleInfoModel, IdentityRoleCreateDto>();
+            CreateMap<CreateModalModel.CreateRoleInfoModel, IdentityRoleCreateDto>();
 
             //EditModal
             CreateMap<RoleInfoModel, IdentityRoleUpdateDto>();
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 3c0e1dbae0..f4efcb12a7 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
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.RazorPages;
@@ -26,5 +27,13 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
 
             return NoContent();
         }
+
+        public class CreateRoleInfoModel
+        {
+            [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/CreateRoleInfoModel.cs b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateRoleInfoModel.cs
deleted file mode 100644
index 7d98d1bf10..0000000000
--- a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateRoleInfoModel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
-{
-    public class CreateRoleInfoModel
-    {
-        [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/Users/Index.cshtml b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
index 9895097802..ee386d41e1 100644
--- a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
@@ -34,7 +34,7 @@
             <thead>
                 <tr>
                     <th>@L["Actions"]</th>
-                    <th>@L["RoleName"]</th>
+                    <th>@L["UserName"]</th>
                     <th>@L["EmailAddress"]</th>
                     <th>@L["PhoneNumber"]</th>
                 </tr>
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 2431c114a9..dbc8386f59 100644
--- a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
+++ b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
@@ -16,21 +16,6 @@
     <EmbeddedResource Include="Localization\Resources\**\*.json" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Remove="Pages\Identity\Roles\CreateModal.cshtml" />
-    <Content Remove="Pages\Identity\Roles\EditModal.cshtml" />
-    <Content Remove="Pages\Identity\Roles\Index.cshtml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Remove="wwwroot\modules\identity\views\roles\index.css" />
-    <EmbeddedResource Remove="wwwroot\modules\identity\views\roles\index.es5.js" />
-    <EmbeddedResource Remove="wwwroot\modules\identity\views\roles\index.es5.min.js" />
-    <EmbeddedResource Remove="wwwroot\modules\identity\views\roles\index.js" />
-    <EmbeddedResource Remove="wwwroot\modules\identity\views\roles\index.less" />
-    <EmbeddedResource Remove="wwwroot\modules\identity\views\roles\index.min.css" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
     <ProjectReference Include="..\Volo.Abp.Identity.Application.Contracts\Volo.Abp.Identity.Application.Contracts.csproj" />