Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-10-30 10:06:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Unauthorized error behaviour.

Browse Source
This commit is contained in:
takezoe
2013-06-29 22:42:40 +09:00
parent 800e11df0c
commit adfb71ea77
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/app/ControllerBase.scala
View File

@@ -69,9 +69,13 @@ abstract class ControllerBase extends ScalatraFilter
}
// TODO redirect to the sign-in page if not logged in?
protected def Unauthorized() = {
protected def Unauthorized()(implicit context: app.Context) = {
if(request.getAttribute("AJAX") == null){
org.scalatra.Unauthorized(redirect("/"))
if(context.loginAccount.isDefined){
org.scalatra.Unauthorized(redirect("/"))
} else {
org.scalatra.Unauthorized(redirect("/signin?" + currentURL))
}
} else {
org.scalatra.Unauthorized()
}