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

Fix problem when GitBucket is working on non root context.

Browse Source
This commit is contained in:
takezoe
2013-07-04 12:50:10 +09:00
parent cb2de890ea
commit c3e668d200
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/app/WikiController.scala
View File

@@ -76,7 +76,7 @@ trait WikiControllerBase extends ControllerBase {
form.content, context.loginAccount.get, form.message.getOrElse("")) form.content, context.loginAccount.get, form.message.getOrElse(""))
updateLastActivityDate(repository.owner, repository.name) updateLastActivityDate(repository.owner, repository.name)
redirect("%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName)) redirect("/%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName))
}) })
get("/:owner/:repository/wiki/_new")(collaboratorsOnly { get("/:owner/:repository/wiki/_new")(collaboratorsOnly {
@@ -88,7 +88,7 @@ trait WikiControllerBase extends ControllerBase {
form.content, context.loginAccount.get, form.message.getOrElse("")) form.content, context.loginAccount.get, form.message.getOrElse(""))
updateLastActivityDate(repository.owner, repository.name) updateLastActivityDate(repository.owner, repository.name)
redirect("%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName)) redirect("/%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName))
}) })
get("/:owner/:repository/wiki/:page/_delete")(collaboratorsOnly { repository => get("/:owner/:repository/wiki/:page/_delete")(collaboratorsOnly { repository =>
@@ -97,7 +97,7 @@ trait WikiControllerBase extends ControllerBase {
deleteWikiPage(repository.owner, repository.name, pageName, context.loginAccount.get.userName, "Delete %s".format(pageName)) deleteWikiPage(repository.owner, repository.name, pageName, context.loginAccount.get.userName, "Delete %s".format(pageName))
updateLastActivityDate(repository.owner, repository.name) updateLastActivityDate(repository.owner, repository.name)
redirect("%s/%s/wiki".format(repository.owner, repository.name)) redirect("/%s/%s/wiki".format(repository.owner, repository.name))
}) })
get("/:owner/:repository/wiki/_pages")(referrersOnly { repository => get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>

2
src/main/scala/servlet/BasicAuthenticationFilter.scala
View File

@@ -22,7 +22,7 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
val response = res.asInstanceOf[HttpServletResponse] val response = res.asInstanceOf[HttpServletResponse]
try { try {
val paths = request.getRequestURI.split("/") val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
val repositoryOwner = paths(2) val repositoryOwner = paths(2)
val repositoryName = paths(3).replaceFirst("\\.git$", "") val repositoryName = paths(3).replaceFirst("\\.git$", "")