Merge pull request #166 from aspnetboilerplate/maliming/patch-3

Remove static Map code and fix some issues.

Author: ismcagdas

src/AbpCompanyName.AbpProjectName.Application/Sessions/SessionAppService.cs

@@ -1,25 +1,33 @@
 using System.Threading.Tasks;
 using Abp.Auditing;
 using Abp.AutoMapper;
+using Abp.ObjectMapping;
 using AbpCompanyName.AbpProjectName.Sessions.Dto;
 
 namespace AbpCompanyName.AbpProjectName.Sessions
 {
     public class SessionAppService : AbpProjectNameAppServiceBase, ISessionAppService
     {
+        private readonly IObjectMapper _objectMapper;
+
+        public SessionAppService(IObjectMapper objectMapper)
+        {
+            _objectMapper = objectMapper;
+        }
+
         [DisableAuditing]
         public async Task<GetCurrentLoginInformationsOutput> GetCurrentLoginInformations()
         {
             var output = new GetCurrentLoginInformationsOutput();
 
             if (AbpSession.UserId.HasValue)
             {
-                output.User = (await GetCurrentUserAsync()).MapTo<UserLoginInfoDto>();
+                output.User = _objectMapper.Map<UserLoginInfoDto>(await GetCurrentUserAsync());
             }
 
             if (AbpSession.TenantId.HasValue)
             {
-                output.Tenant = (await GetCurrentTenantAsync()).MapTo<TenantLoginInfoDto>();
+                output.Tenant = _objectMapper.Map<TenantLoginInfoDto>(await GetCurrentTenantAsync());
             }
 
             return output;

src/AbpCompanyName.AbpProjectName.WebMpa/Controllers/AccountController.cs

@@ -374,7 +374,7 @@ public virtual async Task<ActionResult> ExternalLoginCallback(string returnUrl,
                         return View("TenantSelection", new TenantSelectionViewModel
                         {
                             Action = Url.Action("ExternalLoginCallback", "Account", new { returnUrl }),
-                            Tenants = tenants.MapTo<List<TenantSelectionViewModel.TenantInfo>>()
+                            Tenants = ObjectMapper.Map<List<TenantSelectionViewModel.TenantInfo>>(tenants)
                         });
                 }
             }

src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/tenants/createModal.cshtml

@@ -2,7 +2,7 @@
     <form name="tenantCreateForm" novalidate>
 
         <div class="modal-header">
-            <button type="button" class="close" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" ng-click="vm.cancel()" >
                 <span aria-hidden="true">&times;</span>
             </button>
             <h4 class="modal-title">

src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/tenants/editModal.cshtml

@@ -2,7 +2,7 @@
     <form name="tenantCreateForm" novalidate>
 
         <div class="modal-header">
-            <button type="button" class="close" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" ng-click="vm.cancel()" >
                 <span aria-hidden="true">&times;</span>
             </button>
             <h4 class="modal-title">

src/AbpCompanyName.AbpProjectName.WebSpaAngular/Controllers/AccountController.cs

@@ -388,7 +388,7 @@ public virtual async Task<ActionResult> ExternalLoginCallback(string returnUrl,
                         return View("TenantSelection", new TenantSelectionViewModel
                         {
                             Action = Url.Action("ExternalLoginCallback", "Account", new { returnUrl }),
-                            Tenants = tenants.MapTo<List<TenantSelectionViewModel.TenantInfo>>()
+                            Tenants = ObjectMapper.Map<List<TenantSelectionViewModel.TenantInfo>>(tenants)
                         });
                 }
             }