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

Define session keys.

Browse Source
This commit is contained in:
takezoe
2013-09-23 00:51:57 +09:00
parent 296fc9a3df
commit c57bc487a3
7 changed files with 68 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/app/DashboardController.scala
View File

@@ -1,7 +1,7 @@
package app
import service._
import util.UsersAuthenticator
import util.{UsersAuthenticator, Keys}
import util.Implicits._
class DashboardController extends DashboardControllerBase
@@ -43,10 +43,9 @@ trait DashboardControllerBase extends ControllerBase {
import IssuesService._
// condition
val sessionKey = "dashboard/issues"
val condition = session.putAndGet(sessionKey,
val condition = session.putAndGet(Keys.Session.DashboardIssues,
if(request.hasQueryString) IssueSearchCondition(request)
else session.get(sessionKey).getOrElse(IssueSearchCondition()).asInstanceOf[IssueSearchCondition]
else session.getAs[IssueSearchCondition](Keys.Session.DashboardIssues).getOrElse(IssueSearchCondition())
)
val userName = context.loginAccount.get.userName
@@ -75,10 +74,9 @@ trait DashboardControllerBase extends ControllerBase {
import PullRequestService._
// condition
val sessionKey = "dashboard/pulls"
val condition = session.putAndGet(sessionKey, {
val condition = session.putAndGet(Keys.Session.DashboardPulls, {
if(request.hasQueryString) IssueSearchCondition(request)
else session.getAs[IssueSearchCondition](sessionKey).getOrElse(IssueSearchCondition())
else session.getAs[IssueSearchCondition](Keys.Session.DashboardPulls).getOrElse(IssueSearchCondition())
}.copy(repo = repository))
val userName = context.loginAccount.get.userName