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

AccountService.updateGroup now handles group description

Browse Source
This commit is contained in:
Boris Bera
2015-07-04 14:42:55 -04:00
parent cd62220ba0
commit 28c47dd9c7
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/gitbucket/core/controller/AccountController.scala
View File

@@ -334,7 +334,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
} }
}.toList){ case (groupName, members) => }.toList){ case (groupName, members) =>
getAccountByUserName(groupName, true).map { account => getAccountByUserName(groupName, true).map { account =>
updateGroup(groupName, form.url, false) updateGroup(groupName, form.url, None, false)
// Update GROUP_MEMBER // Update GROUP_MEMBER
updateGroupMembers(form.groupName, members) updateGroupMembers(form.groupName, members)

2
src/main/scala/gitbucket/core/controller/UserManagementController.scala
View File

@@ -152,7 +152,7 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
} }
}.toList){ case (groupName, members) => }.toList){ case (groupName, members) =>
getAccountByUserName(groupName, true).map { account => getAccountByUserName(groupName, true).map { account =>
updateGroup(groupName, form.url, form.isRemoved) updateGroup(groupName, form.url, None, form.isRemoved)
if(form.isRemoved){ if(form.isRemoved){
// Remove from GROUP_MEMBER // Remove from GROUP_MEMBER

8
src/main/scala/gitbucket/core/service/AccountService.scala
View File

@@ -151,8 +151,12 @@ trait AccountService {
isRemoved = false, isRemoved = false,
groupDescription = description) groupDescription = description)
def updateGroup(groupName: String, url: Option[String], removed: Boolean)(implicit s: Session): Unit = def updateGroup(groupName: String, url: Option[String],
Accounts.filter(_.userName === groupName.bind).map(t => t.url.? -> t.removed).update(url, removed) groupDescription: Option[String], removed: Boolean)
(implicit s: Session): Unit =
Accounts.filter(_.userName === groupName.bind)
.map(t => (t.url.?, t.groupDescription.?, t.removed))
.update(url, groupDescription, removed)
def updateGroupMembers(groupName: String, members: List[(String, Boolean)])(implicit s: Session): Unit = { def updateGroupMembers(groupName: String, members: List[(String, Boolean)])(implicit s: Session): Unit = {
GroupMembers.filter(_.groupName === groupName.bind).delete GroupMembers.filter(_.groupName === groupName.bind).delete

13
src/test/scala/gitbucket/core/service/AccountServiceSpec.scala
View File

@@ -85,5 +85,18 @@ class AccountServiceSpec extends Specification with ServiceSpecBase {
} }
} }
}} }}
"updateGroup" should { withTestDB { implicit session =>
"save description" in {
AccountService.createGroup("a-group", None, None)
AccountService.updateGroup("a-group", None, Some("new description"), false)
val group = AccountService.getAccountByUserName("a-group")
group must beSome.like {
case account => account.groupDescription must beSome("new description")
}
}
}}
} }
} }