diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala index 3c37a25..c86f741 100644 --- a/src/main/scala/app/WikiController.scala +++ b/src/main/scala/app/WikiController.scala @@ -2,6 +2,7 @@ import util.{WikiUtil, JGitUtil} import jp.sf.amateras.scalatra.forms._ +import org.eclipse.jgit.api.Git class WikiController extends ControllerBase { @@ -68,4 +69,12 @@ html.wikipages(WikiUtil.getPageList(owner, repository), JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } + + get("/:owner/:repository/wiki/_history"){ + val owner = params("owner") + val repository = params("repository") + + html.wikihistory(JGitUtil.getCommitLog(Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)), "master", 100)._1, + JGitUtil.getRepositoryInfo(owner, repository, servletContext)) + } } \ No newline at end of file diff --git a/src/main/twirl/wikihistory.scala.html b/src/main/twirl/wikihistory.scala.html new file mode 100644 index 0000000..92c75a4 --- /dev/null +++ b/src/main/twirl/wikihistory.scala.html @@ -0,0 +1,33 @@ +@(commits: List[app.CommitInfo], repository: app.RepositoryInfo)(implicit context: app.Context) +@import view.helpers +@import context._ +@main("History - " + repository.owner + "/" + repository.name){ + @header("wiki", repository) + @wikitab("history", repository) + + + + @commits.map { commit => + + + + + + + } +
@commit.committer + @helpers.datetime(commit.time): + @commit.message +
+ + +} \ No newline at end of file diff --git a/src/main/twirl/wikitab.scala.html b/src/main/twirl/wikitab.scala.html index 4155961..756344c 100644 --- a/src/main/twirl/wikitab.scala.html +++ b/src/main/twirl/wikitab.scala.html @@ -3,6 +3,6 @@