mirror of
https://github.com/casdoor/casdoor.git
synced 2025-07-08 00:50:28 +08:00
Support columns arg in UpdateUser().
This commit is contained in:
@ -198,7 +198,7 @@ func (c *ApiController) UploadResource() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
user.Avatar = fileUrl
|
user.Avatar = fileUrl
|
||||||
object.UpdateUser(user.GetId(), user)
|
object.UpdateUser(user.GetId(), user, []string{"avatar"})
|
||||||
case "termsOfUse":
|
case "termsOfUse":
|
||||||
applicationId := fmt.Sprintf("admin/%s", parent)
|
applicationId := fmt.Sprintf("admin/%s", parent)
|
||||||
app := object.GetApplication(applicationId)
|
app := object.GetApplication(applicationId)
|
||||||
|
@ -100,6 +100,7 @@ func (c *ApiController) GetUser() {
|
|||||||
// @router /update-user [post]
|
// @router /update-user [post]
|
||||||
func (c *ApiController) UpdateUser() {
|
func (c *ApiController) UpdateUser() {
|
||||||
id := c.Input().Get("id")
|
id := c.Input().Get("id")
|
||||||
|
columnsStr := c.Input().Get("columns")
|
||||||
|
|
||||||
var user object.User
|
var user object.User
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &user)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &user)
|
||||||
@ -112,7 +113,12 @@ func (c *ApiController) UpdateUser() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
affected := object.UpdateUser(id, &user)
|
columns := []string{}
|
||||||
|
if columnsStr != "" {
|
||||||
|
columns = strings.Split(columnsStr, ",")
|
||||||
|
}
|
||||||
|
|
||||||
|
affected := object.UpdateUser(id, &user, columns)
|
||||||
if affected {
|
if affected {
|
||||||
original.UpdateUserToOriginalDatabase(&user)
|
original.UpdateUserToOriginalDatabase(&user)
|
||||||
}
|
}
|
||||||
|
@ -241,7 +241,7 @@ func GetLastUser(owner string) *User {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func UpdateUser(id string, user *User) bool {
|
func UpdateUser(id string, user *User, columns []string) bool {
|
||||||
owner, name := util.GetOwnerAndNameFromIdNoCheck(id)
|
owner, name := util.GetOwnerAndNameFromIdNoCheck(id)
|
||||||
oldUser := getUser(owner, name)
|
oldUser := getUser(owner, name)
|
||||||
if oldUser == nil {
|
if oldUser == nil {
|
||||||
@ -254,9 +254,13 @@ func UpdateUser(id string, user *User) bool {
|
|||||||
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar)
|
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar)
|
||||||
}
|
}
|
||||||
|
|
||||||
affected, err := adapter.Engine.ID(core.PK{owner, name}).Cols("owner", "display_name", "avatar",
|
if len(columns) == 0 {
|
||||||
"location", "address", "region", "language", "affiliation", "title", "homepage", "bio", "score", "tag",
|
columns = []string{"owner", "display_name", "avatar",
|
||||||
"is_admin", "is_global_admin", "is_forbidden", "is_deleted", "hash", "is_default_avatar", "properties").Update(user)
|
"location", "address", "region", "language", "affiliation", "title", "homepage", "bio", "score", "tag",
|
||||||
|
"is_admin", "is_global_admin", "is_forbidden", "is_deleted", "hash", "is_default_avatar", "properties"}
|
||||||
|
}
|
||||||
|
|
||||||
|
affected, err := adapter.Engine.ID(core.PK{owner, name}).Cols(columns...).Update(user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user