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

Add validation to adding collaborator.

Browse Source
This commit is contained in:
takezoe
2013-06-04 03:16:55 +09:00
parent 783a9684dc
commit b30a6a7542
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@ trait SettingsControllerBase extends ControllerBase { self: RepositoryService wi
case class CollaboratorForm(userName: String) case class CollaboratorForm(userName: String)
val form = mapping( val form = mapping(
"userName" -> trim(label("Username", text(required, existUser))) "userName" -> trim(label("Username", text(required, collaborator)))
)(CollaboratorForm.apply) )(CollaboratorForm.apply)
get("/:owner/:repository/settings") { get("/:owner/:repository/settings") {
@@ -41,12 +41,19 @@ trait SettingsControllerBase extends ControllerBase { self: RepositoryService wi
redirect("/%s/%s/settings/collaborators".format(owner, repository)) redirect("/%s/%s/settings/collaborators".format(owner, repository))
} }
def existUser: Constraint = new Constraint(){ def collaborator: Constraint = new Constraint(){
def validate(name: String, value: String): Option[String] = { def validate(name: String, value: String): Option[String] = {
getAccountByUserName(value) match { getAccountByUserName(value) match {
case None => Some("User does not exist.") case None => Some("User does not exist.")
case Some(x) if(x.userName == context.loginAccount.get.userName) => Some("User can access this repository already.") case Some(x) if(x.userName == context.loginAccount.get.userName) => Some("User can access this repository already.")
case Some(x) => None case Some(x) => {
val paths = request.getRequestURI.split("/")
if(getCollaborators(paths(1), paths(2)).contains(x.userName)){
Some("User can access this repository already.")
} else {
None
}
}
} }
} }
} }