diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala index 5383eaa..8d0d204 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -296,7 +296,7 @@ }) post("/groups/new", newGroupForm)(usersOnly { form => - createGroup(form.groupName, form.url) + createGroup(form.groupName, form.url, None) updateGroupMembers(form.groupName, form.members.split(",").map { _.split(":") match { case Array(userName, isManager) => (userName, isManager.toBoolean) diff --git a/src/main/scala/gitbucket/core/controller/UserManagementController.scala b/src/main/scala/gitbucket/core/controller/UserManagementController.scala index 26c9f88..0beb6c6 100644 --- a/src/main/scala/gitbucket/core/controller/UserManagementController.scala +++ b/src/main/scala/gitbucket/core/controller/UserManagementController.scala @@ -129,7 +129,7 @@ }) post("/admin/users/_newgroup", newGroupForm)(adminOnly { form => - createGroup(form.groupName, form.url) + createGroup(form.groupName, form.url, None) updateGroupMembers(form.groupName, form.members.split(",").map { _.split(":") match { case Array(userName, isManager) => (userName, isManager.toBoolean) diff --git a/src/main/scala/gitbucket/core/service/AccountService.scala b/src/main/scala/gitbucket/core/service/AccountService.scala index 07f77e9..6a298d4 100644 --- a/src/main/scala/gitbucket/core/service/AccountService.scala +++ b/src/main/scala/gitbucket/core/service/AccountService.scala @@ -135,7 +135,7 @@ def updateLastLoginDate(userName: String)(implicit s: Session): Unit = Accounts.filter(_.userName === userName.bind).map(_.lastLoginDate).update(currentDate) - def createGroup(groupName: String, url: Option[String])(implicit s: Session): Unit = + def createGroup(groupName: String, url: Option[String], description: Option[String])(implicit s: Session): Unit = Accounts insert Account( userName = groupName, password = "", @@ -149,7 +149,7 @@ image = None, isGroupAccount = true, isRemoved = false, - groupDescription = None) + groupDescription = description) def updateGroup(groupName: String, url: Option[String], removed: Boolean)(implicit s: Session): Unit = Accounts.filter(_.userName === groupName.bind).map(t => t.url.? -> t.removed).update(url, removed) diff --git a/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala b/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala index ed95f8d..7d85c72 100644 --- a/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala @@ -59,7 +59,7 @@ "group" in { withTestDB { implicit session => val group1 = "group1" val user1 = "root" - AccountService.createGroup(group1, None) + AccountService.createGroup(group1, None, None) AccountService.getGroupMembers(group1) must_== Nil AccountService.getGroupsByUserName(user1) must_== Nil @@ -74,6 +74,16 @@ AccountService.getGroupMembers(group1) must_== Nil AccountService.getGroupsByUserName(user1) must_== Nil }} + + "createGroup" should { withTestDB { implicit session => + "save description" in { + AccountService.createGroup("some-group", None, Some("some clever description")) + val maybeGroup = AccountService.getAccountByUserName("some-group") + + maybeGroup must beSome.like { + case account => account.groupDescription must beSome("some clever description") + } + } + }} } } -