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

modify fields to option

Browse Source
This commit is contained in:
KOUNOIKE
2018-10-13 10:48:10 +09:00
parent c5760bd378
commit ac00c03a96
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/scala/gitbucket/core/api/UpdateAUser.scala
View File

@@ -1,11 +1,11 @@
package gitbucket.core.api package gitbucket.core.api
case class UpdateAUser( case class UpdateAUser(
name: String, name: Option[String],
email: String, email: Option[String],
blog: String, blog: Option[String],
company: String, company: Option[String],
location: String, location: Option[String],
hireable: Boolean, hireable: Option[Boolean],
bio: String bio: Option[String]
) )

6
src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala
View File

@@ -38,9 +38,9 @@ trait ApiUserControllerBase extends ControllerBase {
(for { (for {
data <- extractFromJsonBody[UpdateAUser] data <- extractFromJsonBody[UpdateAUser]
} yield { } yield {
val updatedAccount = context.loginAccount.get.copy( val loginAccount = context.loginAccount.get
mailAddress = data.email, val updatedAccount = loginAccount.copy(
description = Some(data.bio) mailAddress = data.email.getOrElse(loginAccount.mailAddress)
) )
updateAccount(updatedAccount) updateAccount(updatedAccount)
JsonFormat(ApiUser(updatedAccount)) JsonFormat(ApiUser(updatedAccount))