Resolved aspnetboilerplate#20

hikalkan · hikalkan · commit fc68ddab88ef · 2014-06-15T12:06:26.000+03:00
diff --git a/src/Taskever/Taskever.Application/Users/Dto/UserDtosMapper.cs b/src/Taskever/Taskever.Application/Users/Dto/UserDtosMapper.cs
@@ -13,8 +13,8 @@ public static void Map()
                     configuration => configuration.ResolveUsing(
                         user => user.ProfileImage == null
                                     //TODO: How to implement this?
-                                    ? "/Abp/Framework/images/user.png"
-                                    : "/ProfileImages/" + user.ProfileImage
+                                    ? ""
+                                    : "ProfileImages/" + user.ProfileImage
                                          )
                 ).ReverseMap();
 
diff --git a/src/Taskever/Taskever.Web.Mvc/App/Main/views/friends.cshtml b/src/Taskever/Taskever.Web.Mvc/App/Main/views/friends.cshtml
@@ -10,7 +10,7 @@
             <ul class="list-group friend-list-detailed" data-bind="foreach: friendships">
                 <!-- ko if: status() == 2 -->
                 <li class="list-group-item">
-                    <img data-bind="attr: { src: friend.profileImage() }" />
+                    <img data-bind="attr: { src: abp.toAbsAppPath(friend.profileImage()) }" />
                     <div class="row">
                         <div class="col-xs-8">
                             <div class="user-info">
@@ -39,7 +39,7 @@
             <ul class="list-group friend-list-detailed" data-bind="foreach: friendships">
                 <!-- ko if: status() == 1 -->
                 <li class="list-group-item">
-                    <img data-bind="attr: { src: friend.profileImage() }" />
+                    <img data-bind="attr: { src: abp.toAbsAppPath(friend.profileImage()) }" />
                     <div class="user-info">
                         <div>
                             <a data-bind="attr: { href: '#user/' + friend.id() }">
@@ -61,7 +61,7 @@
             <ul class="list-group friend-list-detailed" data-bind="foreach: friendships">
                 <!-- ko if: status() == 0 -->
                 <li class="list-group-item">
-                    <img data-bind="attr: { src: friend.profileImage() }" />
+                    <img data-bind="attr: { src: abp.toAbsAppPath(friend.profileImage()) }" />
                     <div class="user-info">
                         <div>
                             <a data-bind="attr: { href: '#user/' + friend.id() }">
diff --git a/src/Taskever/Taskever.Web.Mvc/App/Main/views/user.cshtml b/src/Taskever/Taskever.Web.Mvc/App/Main/views/user.cshtml
@@ -1,6 +1,6 @@
 ﻿<section>
     <div class="panel panel-default" style="margin-bottom: 10px; position: relative; height: 70px">
-        <img data-bind="attr: { src: user.profileImage() }" style="width: 64px; height: 64px; position: absolute; top: 2px; left: 2px;" alt="" />
+        <img data-bind="attr: { src: abp.toAbsAppPath(user.profileImage()) }" style="width: 64px; height: 64px; position: absolute; top: 2px; left: 2px;" alt="" />
         <div style="margin-left: 75px; margin-top: 36px">
             <h4 data-bind="text: user.name() + ' ' + user.surname()"></h4>
         </div>
diff --git a/src/Taskever/Taskever.Web.Mvc/Controllers/AccountController.cs b/src/Taskever/Taskever.Web.Mvc/Controllers/AccountController.cs
@@ -39,15 +39,20 @@ public AccountController(ITaskeverUserAppService userAppService, AbpUserManager
             _userManager = userManager;
         }
 
-        public virtual ActionResult Login(string returnUrl = "/", string loginMessage = "")
+        public virtual ActionResult Login(string returnUrl = "", string loginMessage = "")
         {
+            if (string.IsNullOrWhiteSpace(returnUrl))
+            {
+                returnUrl = Request.ApplicationPath;
+            }
+
             ViewBag.ReturnUrl = returnUrl;
             ViewBag.LoginMessage = loginMessage;
             return View();
         }
 
         [HttpPost]
-        public virtual async Task<JsonResult> Login(LoginModel loginModel, string returnUrl = "/")
+        public virtual async Task<JsonResult> Login(LoginModel loginModel, string returnUrl = "")
         {
             if (!ModelState.IsValid)
             {
@@ -62,6 +67,11 @@ public virtual async Task<JsonResult> Login(LoginModel loginModel, string return
             
             await SignInAsync(user, loginModel.RememberMe);
 
+            if (string.IsNullOrWhiteSpace(returnUrl))
+            {
+                returnUrl = Request.ApplicationPath;
+            }
+
             return Json(new AbpMvcAjaxResponse { TargetUrl = returnUrl });
         }
 

Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,20 @@ public AccountController(ITaskeverUserAppService userAppService, AbpUserManager`
`39`	`39`	`_userManager = userManager;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public virtual ActionResult Login(string returnUrl = "/", string loginMessage = "")`
	`42`	`+ public virtual ActionResult Login(string returnUrl = "", string loginMessage = "")`
`43`	`43`	`{`
	`44`	`+ if (string.IsNullOrWhiteSpace(returnUrl))`
	`45`	`+ {`
	`46`	`+ returnUrl = Request.ApplicationPath;`
	`47`	`+ }`
	`48`	`+`
`44`	`49`	`ViewBag.ReturnUrl = returnUrl;`
`45`	`50`	`ViewBag.LoginMessage = loginMessage;`
`46`	`51`	`return View();`
`47`	`52`	`}`
`48`	`53`
`49`	`54`	`[HttpPost]`
`50`		`- public virtual async Task<JsonResult> Login(LoginModel loginModel, string returnUrl = "/")`
	`55`	`+ public virtual async Task<JsonResult> Login(LoginModel loginModel, string returnUrl = "")`
`51`	`56`	`{`
`52`	`57`	`if (!ModelState.IsValid)`
`53`	`58`	`{`
`@@ -62,6 +67,11 @@ public virtual async Task<JsonResult> Login(LoginModel loginModel, string return`
`62`	`67`
`63`	`68`	`await SignInAsync(user, loginModel.RememberMe);`
`64`	`69`
	`70`	`+ if (string.IsNullOrWhiteSpace(returnUrl))`
	`71`	`+ {`
	`72`	`+ returnUrl = Request.ApplicationPath;`
	`73`	`+ }`
	`74`	`+`
`65`	`75`	`return Json(new AbpMvcAjaxResponse { TargetUrl = returnUrl });`
`66`	`76`	`}`
`67`	`77`