Merge branch 'master' of https://github.com/takezoe/gitbucket.git

src/main/scala/app/ControllerBase.scala

@@ -18,8 +18,13 @@ abstract class ControllerBase extends ScalatraFilter
   /**
    * Returns the context object for the request.
    */
-  implicit def context: Context = Context(servletContext.getContextPath, LoginAccount)
+  implicit def context: Context = Context(servletContext.getContextPath, LoginAccount, currentURL)
-  
+
+  private def currentURL: String = {
+    val queryString = request.getQueryString
+    request.getRequestURI + (if(queryString != null) "?" + queryString else "")
+  }
+
   private def LoginAccount: Option[Account] = {
     session.get("LOGIN_ACCOUNT") match {
       case Some(x: Account) => Some(x)
@@ -79,4 +84,4 @@ abstract class ControllerBase extends ScalatraFilter
 
 }
 
-case class Context(path: String, loginAccount: Option[Account])
+case class Context(path: String, loginAccount: Option[Account], currentUrl: String)

src/main/scala/app/SignInController.scala

@@ -15,6 +15,10 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
   )(SignInForm.apply)
   
   get("/signin"){
+    val queryString = request.getQueryString
+    if(queryString.startsWith("/")){
+      session.setAttribute("REDIRECT", queryString)
+    }
     html.signin(loadSystemSettings())
   }
 
@@ -25,7 +29,13 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
     } else {
       session.setAttribute("LOGIN_ACCOUNT", account.get)
       updateLastLoginDate(account.get.userName)
-      redirect("/%s".format(account.get.userName))
+
+      session.get("REDIRECT").map { redirectUrl =>
+        session.removeAttribute("REDIRECT")
+        redirect(redirectUrl.asInstanceOf[String])
+      }.getOrElse {
+        redirect("/%s".format(account.get.userName))
+      }
     }
   }
 

src/main/twirl/main.scala.html

@@ -41,10 +41,12 @@
               @if(loginAccount.isDefined){
                 <li><a href="@path/new">New repo</a></li>
                 <li><a href="@url(loginAccount.get.userName)">Account</a></li>
-                <li><a href="@path/admin/users">Administration</a></li>
+                @if(loginAccount.get.isAdmin){
+                  <li><a href="@path/admin/users">Administration</a></li>
+                }
                 <li><a href="@path/signout">Sign out</a></li>
               } else {
-                <li><a href="@path/signin">Sign in</a></li>
+                <li><a href="@path/signin?@currentUrl">Sign in</a></li>
               }
             </ul>
           </div><!--/.nav-collapse -->