Merge branch 'master' into fork-and-pullreq

Conflicts:
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/util/JGitUtil.scala

src/main/scala/app/ControllerBase.scala

@@ -1,7 +1,7 @@
 package app
 
 import _root_.util.Directory._
-import _root_.util.{FileUtil, Validations}
+import _root_.util.{StringUtil, FileUtil, Validations}
 import org.scalatra._
 import org.scalatra.json._
 import org.json4s._
@@ -10,7 +10,7 @@ import org.apache.commons.io.FileUtils
 import model.Account
 import scala.Some
 import service.AccountService
-import javax.servlet.http.{HttpSession, HttpServletRequest}
+import javax.servlet.http.{HttpServletResponse, HttpSession, HttpServletRequest}
 import java.text.SimpleDateFormat
 import javax.servlet.{FilterChain, ServletResponse, ServletRequest}
 
@@ -23,16 +23,28 @@ abstract class ControllerBase extends ScalatraFilter
   implicit val jsonFormats = DefaultFormats
 
   override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain) {
-    val httpRequest = request.asInstanceOf[HttpServletRequest]
-    val path = httpRequest.getRequestURI.substring(request.getServletContext.getContextPath.length)
+    val httpRequest  = request.asInstanceOf[HttpServletRequest]
+    val httpResponse = response.asInstanceOf[HttpServletResponse]
+    val context      = request.getServletContext.getContextPath
+    val path         = httpRequest.getRequestURI.substring(context.length)
 
     if(path.startsWith("/console/")){
-      Option(httpRequest.getSession.getAttribute("LOGIN_ACCOUNT").asInstanceOf[Account]).collect {
-        case account if(account.isAdmin) => chain.doFilter(request, response)
+      val account = httpRequest.getSession.getAttribute("LOGIN_ACCOUNT").asInstanceOf[Account]
+      if(account == null){
+        // Redirect to login form
+        httpResponse.sendRedirect(context + "/signin?" + path)
+      } else if(account.isAdmin){
+        // H2 Console (administrators only)
+        chain.doFilter(request, response)
+      } else {
+        // Redirect to dashboard
+        httpResponse.sendRedirect(context + "/")
       }
     } else if(path.startsWith("/git/")){
+      // Git repository
       chain.doFilter(request, response)
     } else {
+      // Scalatra actions
       super.doFilter(request, response, chain)
     }
   }

src/main/scala/app/CreateRepositoryController.scala

@@ -193,4 +193,4 @@ trait CreateRepositoryControllerBase extends ControllerBase {
       }
   }
   
-}
+}

src/main/scala/app/DashboardController.scala

@@ -0,0 +1,49 @@
+package app
+
+import service._
+import util.UsersAuthenticator
+
+class DashboardController extends DashboardControllerBase
+  with IssuesService with RepositoryService with AccountService
+  with UsersAuthenticator
+
+trait DashboardControllerBase extends ControllerBase {
+  self: IssuesService with RepositoryService with UsersAuthenticator =>
+
+  get("/dashboard/issues/repos")(usersOnly {
+    searchIssues("all")
+  })
+
+  get("/dashboard/issues/assigned")(usersOnly {
+    searchIssues("assigned")
+  })
+
+  get("/dashboard/issues/created_by")(usersOnly {
+    searchIssues("created_by")
+  })
+
+  private def searchIssues(filter: String) = {
+    import IssuesService._
+
+    // condition
+    val sessionKey = "dashboard/issues"
+    val condition = if(request.getQueryString == null)
+      session.get(sessionKey).getOrElse(IssueSearchCondition()).asInstanceOf[IssueSearchCondition]
+    else IssueSearchCondition(request)
+
+    session.put(sessionKey, condition)
+
+    val repositories = getAccessibleRepositories(context.loginAccount, baseUrl)
+    // 
+    dashboard.html.issues(
+        issues.html.listparts(Nil, 0, 0, 0, condition),
+        0,
+        0,
+        0,
+        repositories,
+        condition,
+        filter)    
+    
+  }
+
+}