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

Fix template file names.

Browse Source
This commit is contained in:
takezoe
2013-07-01 13:07:02 +09:00
parent 8e45a8d3dd
commit 1b13ca1c8d
17 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,13 +34,13 @@ trait AccountControllerBase extends ControllerBase {
get("/:userName") {
val userName = params("userName")
getAccountByUserName(userName).map {
account.html.userinfo(_, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
account.html.info(_, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
} getOrElse NotFound
}
get("/:userName/_edit")(ownerOnly {
val userName = params("userName")
getAccountByUserName(userName).map(x => account.html.useredit(Some(x))) getOrElse NotFound
getAccountByUserName(userName).map(x => account.html.edit(Some(x))) getOrElse NotFound
})
post("/:userName/_edit", editForm)(ownerOnly { form =>
@@ -56,7 +56,7 @@ trait AccountControllerBase extends ControllerBase {
get("/register"){
if(loadSystemSettings().allowAccountRegistration){
account.html.useredit(None)
account.html.edit(None)
} else NotFound
}

8
src/main/scala/app/LabelsController.scala
View File

@@ -36,7 +36,7 @@ trait LabelsControllerBase extends ControllerBase {
val repository = params("repository")
getRepository(owner, repository, baseUrl)
.map(issues.html.labeleditlist(getLabels(owner, repository), _)) getOrElse NotFound()
.map(issues.labels.html.editlist(getLabels(owner, repository), _)) getOrElse NotFound()
})
ajaxGet("/:owner/:repository/issues/label/:labelId/edit")(writableRepository {
@@ -45,7 +45,7 @@ trait LabelsControllerBase extends ControllerBase {
val labelId = params("labelId").toInt
getRepository(owner, repository, baseUrl).map { repositoryInfo =>
getLabel(owner, repository, labelId).map(label => issues.html.labeledit(Some(label), repositoryInfo)) getOrElse NotFound()
getLabel(owner, repository, labelId).map(label => issues.labels.html.edit(Some(label), repositoryInfo)) getOrElse NotFound()
} getOrElse NotFound()
})
@@ -56,7 +56,7 @@ trait LabelsControllerBase extends ControllerBase {
getRepository(owner, repository, baseUrl).map{ repositoryInfo =>
updateLabel(owner, repository, labelId, form.labelName, form.color.substring(1))
issues.html.labeleditlist(getLabels(owner, repository), repositoryInfo)
issues.labels.html.editlist(getLabels(owner, repository), repositoryInfo)
} getOrElse NotFound()
})
@@ -67,7 +67,7 @@ trait LabelsControllerBase extends ControllerBase {
getRepository(owner, repository, baseUrl).map { repositoryInfo =>
deleteLabel(owner, repository, labelId)
issues.html.labeleditlist(getLabels(owner, repository), repositoryInfo)
issues.labels.html.editlist(getLabels(owner, repository), repositoryInfo)
} getOrElse NotFound()
})

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

@@ -27,7 +27,7 @@ trait MilestonesControllerBase extends ControllerBase {
val state = params.getOrElse("state", "open")
getRepository(owner, repository, baseUrl).map { repositoryInfo =>
issues.html.milestones(state,
issues.milestones.html.list(state,
getMilestonesWithIssueCount(owner, repository),
repositoryInfo,
isWritable(owner, repository, context.loginAccount))
@@ -38,7 +38,7 @@ trait MilestonesControllerBase extends ControllerBase {
val owner = params("owner")
val repository = params("repository")
getRepository(owner, repository, baseUrl).map(issues.html.milestoneedit(None, _)) getOrElse NotFound
getRepository(owner, repository, baseUrl).map(issues.milestones.html.edit(None, _)) getOrElse NotFound
})
post("/:owner/:repository/issues/milestones/new", milestoneForm)(writableRepository { form =>
@@ -55,7 +55,7 @@ trait MilestonesControllerBase extends ControllerBase {
val milestoneId = params("milestoneId").toInt
getRepository(owner, repository, baseUrl).map(
issues.html.milestoneedit(getMilestone(owner, repository, milestoneId), _)) getOrElse NotFound
issues.milestones.html.edit(getMilestone(owner, repository, milestoneId), _)) getOrElse NotFound
})
post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(writableRepository { form =>

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

@@ -33,7 +33,7 @@ trait WikiControllerBase extends ControllerBase {
getRepository(owner, repository, baseUrl).map { repositoryInfo =>
getWikiPage(owner, repository, "Home").map { page =>
wiki.html.wiki("Home", page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
wiki.html.page("Home", page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
} getOrElse redirect("/%s/%s/wiki/Home/_edit".format(owner, repository))
} getOrElse NotFound
})
@@ -45,7 +45,7 @@ trait WikiControllerBase extends ControllerBase {
getRepository(owner, repository, baseUrl).map { repositoryInfo =>
getWikiPage(owner, repository, pageName).map { page =>
wiki.html.wiki(pageName, page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
wiki.html.page(pageName, page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
} getOrElse redirect("/%s/%s/wiki/%s/_edit".format(owner, repository, pageName)) // TODO URLEncode
} getOrElse NotFound
})
@@ -57,7 +57,7 @@ trait WikiControllerBase extends ControllerBase {
getRepository(owner, repository, baseUrl).map { repositoryInfo =>
JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
wiki.html.wikihistory(Some(page), JGitUtil.getCommitLog(git, "master", path = page + ".md")._1, repositoryInfo)
wiki.html.history(Some(page), JGitUtil.getCommitLog(git, "master", path = page + ".md")._1, repositoryInfo)
}
} getOrElse NotFound
})
@@ -70,7 +70,7 @@ trait WikiControllerBase extends ControllerBase {
getRepository(owner, repository, baseUrl).map { repositoryInfo =>
JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
wiki.html.wikicompare(Some(page), getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
wiki.html.compare(Some(page), getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
}
} getOrElse NotFound
})
@@ -82,7 +82,7 @@ trait WikiControllerBase extends ControllerBase {
getRepository(owner, repository, baseUrl).map { repositoryInfo =>
JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
wiki.html.wikicompare(None, getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
wiki.html.compare(None, getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
}
} getOrElse NotFound
})
@@ -93,7 +93,7 @@ trait WikiControllerBase extends ControllerBase {
val page = params("page")
getRepository(owner, repository, baseUrl).map(
wiki.html.wikiedit(page, getWikiPage(owner, repository, page), _)) getOrElse NotFound
wiki.html.edit(page, getWikiPage(owner, repository, page), _)) getOrElse NotFound
})
post("/:owner/:repository/wiki/_edit", editForm)(writableRepository { form =>
@@ -111,7 +111,7 @@ trait WikiControllerBase extends ControllerBase {
val owner = params("owner")
val repository = params("repository")
getRepository(owner, repository, baseUrl).map(wiki.html.wikiedit("", None, _)) getOrElse NotFound
getRepository(owner, repository, baseUrl).map(wiki.html.edit("", None, _)) getOrElse NotFound
})
post("/:owner/:repository/wiki/_new", newForm)(writableRepository { form =>
@@ -140,7 +140,7 @@ trait WikiControllerBase extends ControllerBase {
val repository = params("repository")
getRepository(owner, repository, baseUrl).map {
wiki.html.wikipages(getWikiPageList(owner, repository), _, isWritable(owner, repository, context.loginAccount))
wiki.html.pages(getWikiPageList(owner, repository), _, isWritable(owner, repository, context.loginAccount))
} getOrElse NotFound
})
@@ -150,7 +150,7 @@ trait WikiControllerBase extends ControllerBase {
getRepository(owner, repository, baseUrl).map { repositoryInfo =>
JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
wiki.html.wikihistory(None, JGitUtil.getCommitLog(git, "master")._1, repositoryInfo)
wiki.html.history(None, JGitUtil.getCommitLog(git, "master")._1, repositoryInfo)
}
} getOrElse NotFound
})