mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-07 22:15:51 +01:00
Add app.Context to transfer implicit data from Servlet to view.
This commit is contained in:
@@ -24,7 +24,7 @@ class CreateRepositoryServlet extends ServletBase {
|
||||
* Show the new repository form.
|
||||
*/
|
||||
get("/") {
|
||||
html.newrepo.render()
|
||||
html.newrepo()
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -25,7 +25,7 @@ class RepositoryViewerServlet extends ServletBase {
|
||||
*/
|
||||
get("/:owner") {
|
||||
val owner = params("owner")
|
||||
html.user.render(owner, getRepositories(owner).map(getRepositoryInfo(owner, _)))
|
||||
html.user(owner, getRepositories(owner).map(getRepositoryInfo(owner, _)))
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -85,7 +85,7 @@ class RepositoryViewerServlet extends ServletBase {
|
||||
}
|
||||
}
|
||||
|
||||
html.commits.render(branchName, getRepositoryInfo(owner, repository),
|
||||
html.commits(branchName, getRepositoryInfo(owner, repository),
|
||||
listBuffer.toSeq.splitWith{ (commit1, commit2) =>
|
||||
view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
|
||||
}, page, i.hasNext)
|
||||
@@ -108,7 +108,7 @@ class RepositoryViewerServlet extends ServletBase {
|
||||
val git = Git.open(dir)
|
||||
val latestRev = git.log.addPath(path).call.iterator.next
|
||||
|
||||
html.blob.render(branchName, getRepositoryInfo(owner, repository), path.split("/").toList, content,
|
||||
html.blob(branchName, getRepositoryInfo(owner, repository), path.split("/").toList, content,
|
||||
CommitInfo(latestRev.getName, latestRev.getCommitterIdent.getWhen, latestRev.getCommitterIdent.getName, latestRev.getShortMessage))
|
||||
}
|
||||
|
||||
@@ -187,7 +187,7 @@ class RepositoryViewerServlet extends ServletBase {
|
||||
val git = Git.open(dir)
|
||||
val latestRev = {if(path == ".") git.log else git.log.addPath(path)}.call.iterator.next
|
||||
|
||||
html.files.render(
|
||||
html.files(
|
||||
// current branch
|
||||
branchName,
|
||||
// repository
|
||||
|
||||
@@ -14,6 +14,8 @@ abstract class ServletBase extends ScalatraServlet with JacksonJsonSupport {
|
||||
|
||||
implicit val jsonFormats = DefaultFormats
|
||||
|
||||
implicit def context: Context = Context(servletContext.getContextPath)
|
||||
|
||||
// TODO get from session
|
||||
val LoginUser = System.getProperty("user.name")
|
||||
|
||||
@@ -42,4 +44,6 @@ abstract class ServletBase extends ScalatraServlet with JacksonJsonSupport {
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
case class Context(path: String)
|
||||
Reference in New Issue
Block a user