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

Fix error response.

Browse Source
This commit is contained in:
takezoe
2013-06-05 03:01:51 +09:00
parent 4d5ce740c4
commit b3e76db227
4 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/app/ControllerBase.scala
View File

@@ -26,6 +26,9 @@ abstract class ControllerBase extends ScalatraFilter with ClientSideValidationFo
}
}
protected def NotFound() = redirect("/")
protected def Unauthorized() = redirect("/")
}
case class Context(path: String, loginAccount: Option[Account])

11
src/main/scala/app/RepositoryViewerController.scala
View File

@@ -26,8 +26,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
*/
get("/:owner") {
val owner = params("owner")
html.user(getAccountByUserName(owner).get, getRepositoriesOfUser(owner, servletContext))
getAccountByUserName(owner) match {
case Some(account) => html.user(account, getRepositoriesOfUser(owner, servletContext))
case None => NotFound()
}
}
/**
@@ -36,7 +38,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
get("/:owner/:repository")(readableRepository {
val owner = params("owner")
val repository = params("repository")
fileList(owner, repository)
})
@@ -98,8 +100,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
}, page, hasNext)
}
})
/**
* Displays the file content of the specified branch or commit.
*/

17
src/main/scala/app/SettingsController.scala
View File

@@ -30,6 +30,7 @@ trait SettingsControllerBase extends ControllerBase {
get("/:owner/:repository/settings")(ownerOnly {
val owner = params("owner")
val repository = params("repository")
redirect("/%s/%s/settings/options".format(owner, repository))
})
@@ -39,8 +40,11 @@ trait SettingsControllerBase extends ControllerBase {
get("/:owner/:repository/settings/options")(ownerOnly {
val owner = params("owner")
val repository = params("repository")
settings.html.options(getRepository(owner, repository, servletContext).get)
getRepository(owner, repository, servletContext) match {
case Some(r) => settings.html.options(r)
case None => NotFound()
}
})
/**
@@ -62,8 +66,11 @@ trait SettingsControllerBase extends ControllerBase {
get("/:owner/:repository/settings/collaborators")(ownerOnly {
val owner = params("owner")
val repository = params("repository")
settings.html.collaborators(getCollaborators(owner, repository), getRepository(owner, repository, servletContext).get)
getRepository(owner, repository, servletContext) match {
case Some(r) => settings.html.collaborators(getCollaborators(owner, repository), r)
case None => NotFound()
}
})
/**
@@ -72,6 +79,7 @@ trait SettingsControllerBase extends ControllerBase {
post("/:owner/:repository/settings/collaborators/add", collaboratorForm)(ownerOnly { form =>
val owner = params("owner")
val repository = params("repository")
addCollaborator(owner, repository, form.userName)
redirect("/%s/%s/settings/collaborators".format(owner, repository))
})
@@ -83,6 +91,7 @@ trait SettingsControllerBase extends ControllerBase {
val owner = params("owner")
val repository = params("repository")
val userName = params("name")
removeCollaborator(owner, repository, userName)
redirect("/%s/%s/settings/collaborators".format(owner, repository))
})