mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-06 21:45:50 +01:00
(refs #8)Group repository creation is completed.
This commit is contained in:
@@ -22,7 +22,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
|
|||||||
case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
|
case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
|
||||||
|
|
||||||
val form = mapping(
|
val form = mapping(
|
||||||
"owner" -> trim(label("Owner" , text(required, maxlength(40), identifier))), // TODO check existence.
|
"owner" -> trim(label("Owner" , text(required, maxlength(40), identifier, existsAccount))),
|
||||||
"name" -> trim(label("Repository name", text(required, maxlength(40), identifier, unique))),
|
"name" -> trim(label("Repository name", text(required, maxlength(40), identifier, unique))),
|
||||||
"description" -> trim(label("Description" , optional(text()))),
|
"description" -> trim(label("Description" , optional(text()))),
|
||||||
"isPrivate" -> trim(label("Repository Type", boolean())),
|
"isPrivate" -> trim(label("Repository Type", boolean())),
|
||||||
@@ -40,12 +40,20 @@ trait CreateRepositoryControllerBase extends ControllerBase {
|
|||||||
* Create new repository.
|
* Create new repository.
|
||||||
*/
|
*/
|
||||||
post("/new", form)(usersOnly { form =>
|
post("/new", form)(usersOnly { form =>
|
||||||
|
val ownerAccount = getAccountByUserName(form.owner).get
|
||||||
val loginAccount = context.loginAccount.get
|
val loginAccount = context.loginAccount.get
|
||||||
val loginUserName = loginAccount.userName
|
val loginUserName = loginAccount.userName
|
||||||
|
|
||||||
// Insert to the database at first
|
// Insert to the database at first
|
||||||
createRepository(form.name, form.owner, form.description, form.isPrivate)
|
createRepository(form.name, form.owner, form.description, form.isPrivate)
|
||||||
|
|
||||||
|
// Add collaborators for group repository
|
||||||
|
if(ownerAccount.isGroupAccount){
|
||||||
|
getGroupMembers(form.owner).foreach { userName =>
|
||||||
|
addCollaborator(form.owner, form.name, userName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Insert default labels
|
// Insert default labels
|
||||||
createLabel(form.owner, form.name, "bug", "fc2929")
|
createLabel(form.owner, form.name, "bug", "fc2929")
|
||||||
createLabel(form.owner, form.name, "duplicate", "cccccc")
|
createLabel(form.owner, form.name, "duplicate", "cccccc")
|
||||||
@@ -90,20 +98,26 @@ trait CreateRepositoryControllerBase extends ControllerBase {
|
|||||||
createWikiRepository(loginAccount, form.owner, form.name)
|
createWikiRepository(loginAccount, form.owner, form.name)
|
||||||
|
|
||||||
// Record activity
|
// Record activity
|
||||||
recordCreateRepositoryActivity(loginUserName, form.name, form.owner)
|
recordCreateRepositoryActivity(form.owner, form.name, loginUserName)
|
||||||
|
|
||||||
// redirect to the repository
|
// redirect to the repository
|
||||||
redirect(s"/${form.owner}/${form.name}")
|
redirect(s"/${form.owner}/${form.name}")
|
||||||
})
|
})
|
||||||
|
|
||||||
|
private def existsAccount: Constraint = new Constraint(){
|
||||||
|
def validate(name: String, value: String): Option[String] =
|
||||||
|
if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Duplicate check for the repository name.
|
* Duplicate check for the repository name.
|
||||||
*/
|
*/
|
||||||
private def unique: Constraint = new Constraint(){
|
private def unique: Constraint = new Constraint(){
|
||||||
def validate(name: String, value: String): Option[String] = {
|
def validate(name: String, value: String): Option[String] =
|
||||||
// TODO fix to retreive user name from request parameter
|
params.get("owner").flatMap { userName =>
|
||||||
getRepositoryNamesOfUser(context.loginAccount.get.userName).find(_ == value).map(_ => "Repository already exists.")
|
getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -54,14 +54,19 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
|
|||||||
* Display the Collaborators page.
|
* Display the Collaborators page.
|
||||||
*/
|
*/
|
||||||
get("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
|
get("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
|
||||||
settings.html.collaborators(getCollaborators(repository.owner, repository.name), repository)
|
settings.html.collaborators(
|
||||||
|
getCollaborators(repository.owner, repository.name),
|
||||||
|
getAccountByUserName(repository.owner).get.isGroupAccount,
|
||||||
|
repository)
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add the collaborator.
|
* Add the collaborator.
|
||||||
*/
|
*/
|
||||||
post("/:owner/:repository/settings/collaborators/add", collaboratorForm)(ownerOnly { (form, repository) =>
|
post("/:owner/:repository/settings/collaborators/add", collaboratorForm)(ownerOnly { (form, repository) =>
|
||||||
addCollaborator(repository.owner, repository.name, form.userName)
|
if(!getAccountByUserName(repository.owner).get.isGroupAccount){
|
||||||
|
addCollaborator(repository.owner, repository.name, form.userName)
|
||||||
|
}
|
||||||
redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
|
redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -69,7 +74,9 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
|
|||||||
* Add the collaborator.
|
* Add the collaborator.
|
||||||
*/
|
*/
|
||||||
get("/:owner/:repository/settings/collaborators/remove")(ownerOnly { repository =>
|
get("/:owner/:repository/settings/collaborators/remove")(ownerOnly { repository =>
|
||||||
removeCollaborator(repository.owner, repository.name, params("name"))
|
if(!getAccountByUserName(repository.owner).get.isGroupAccount){
|
||||||
|
removeCollaborator(repository.owner, repository.name, params("name"))
|
||||||
|
}
|
||||||
redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
|
redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ trait AccountService {
|
|||||||
Accounts insert Account(
|
Accounts insert Account(
|
||||||
userName = groupName,
|
userName = groupName,
|
||||||
password = "",
|
password = "",
|
||||||
mailAddress = "",
|
mailAddress = groupName + "@devnull",
|
||||||
isAdmin = false,
|
isAdmin = false,
|
||||||
url = None,
|
url = None,
|
||||||
registeredDate = currentDate,
|
registeredDate = currentDate,
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
@(collaborators: List[String], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
|
@(collaborators: List[String],
|
||||||
|
isGroupRepository: Boolean,
|
||||||
|
repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
|
||||||
@import context._
|
@import context._
|
||||||
@import view.helpers._
|
@import view.helpers._
|
||||||
@html.main("Settings", Some(repository)){
|
@html.main("Settings", Some(repository)){
|
||||||
@@ -9,17 +11,21 @@
|
|||||||
@collaborators.map { collaboratorName =>
|
@collaborators.map { collaboratorName =>
|
||||||
<li>
|
<li>
|
||||||
<a href="@url(collaboratorName)">@collaboratorName</a>
|
<a href="@url(collaboratorName)">@collaboratorName</a>
|
||||||
<a href="@url(repository)/settings/collaborators/remove?name=@collaboratorName" class="remove">(remove)</a>
|
@if(!isGroupRepository){
|
||||||
|
<a href="@url(repository)/settings/collaborators/remove?name=@collaboratorName" class="remove">(remove)</a>
|
||||||
|
}
|
||||||
</li>
|
</li>
|
||||||
}
|
}
|
||||||
</ul>
|
</ul>
|
||||||
<form method="POST" action="@url(repository)/settings/collaborators/add" validate="true">
|
@if(!isGroupRepository){
|
||||||
<div>
|
<form method="POST" action="@url(repository)/settings/collaborators/add" validate="true">
|
||||||
<span class="error" id="error-userName"></span>
|
<div>
|
||||||
</div>
|
<span class="error" id="error-userName"></span>
|
||||||
<input type="text" name="userName" id="userName" style="width: 300px; margin-bottom: 0px;"/>
|
</div>
|
||||||
<input type="submit" class="btn" value="Add"/>
|
<input type="text" name="userName" id="userName" style="width: 300px; margin-bottom: 0px;"/>
|
||||||
</form>
|
<input type="submit" class="btn" value="Add"/>
|
||||||
|
</form>
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
Reference in New Issue
Block a user