API: orgEditTeam make Fields optional

modules/structs/org_team.go

@@ -35,12 +35,12 @@ type CreateTeamOption struct {
 // EditTeamOption options for editing a team
 type EditTeamOption struct {
  // required: true
- Name string `json:"name" binding:"Required;AlphaDashDot;MaxSize(30)"`
+ Name string `json:"name" binding:"AlphaDashDot;MaxSize(30)"`
  Description string `json:"description" binding:"MaxSize(255)"`
  IncludesAllRepositories bool `json:"includes_all_repositories"`
  // enum: read,write,admin
  Permission string `json:"permission"`
  // example: ["repo.code","repo.issues","repo.ext_issues","repo.wiki","repo.pulls","repo.releases","repo.ext_wiki"]
  Units []string `json:"units"`
- CanCreateOrgRepo bool  `json:"can_create_org_repo"`
+ CanCreateOrgRepo *bool `json:"can_create_org_repo"`
 }

routers/api/v1/org/team.go

@@ -192,17 +192,28 @@ func EditTeam(ctx *context.APIContext, form api.EditTeamOption) {
  // "$ref": "#/responses/Team"
 
  team := ctx.Org.Team
- team.Description = form.Description
- unitTypes := models.FindUnitTypes(form.Units...)
- team.CanCreateOrgRepo = form.CanCreateOrgRepo
+ if err := team.GetUnits(); err != nil {
+ ctx.InternalServerError(err)
+ }
+
+ if form.CanCreateOrgRepo != nil {
+ team.CanCreateOrgRepo = *form.CanCreateOrgRepo
+ }
+
+ if form.Name != "" {
+ team.Name = form.Name
+ }
+
+ if form.Description != "" {
+ team.Description = form.Description
+ }
 
  isAuthChanged := false
  isIncludeAllChanged := false
- if !team.IsOwnerTeam() {
+ if !team.IsOwnerTeam() && form.Permission != "" {
  // Validate permission level.
  auth := models.ParseAccessMode(form.Permission)
 
- team.Name = form.Name
  if team.Authorize != auth {
  isAuthChanged = true
  team.Authorize = auth
@@ -215,14 +226,17 @@ func EditTeam(ctx *context.APIContext, form api.EditTeamOption) {
  }
 
  if team.Authorize < models.AccessModeOwner {
- var units = make([]*models.TeamUnit, 0, len(form.Units))
- for _, tp := range unitTypes {
- units = append(units, &models.TeamUnit{
- OrgID: ctx.Org.Team.OrgID,
- Type: tp,
- })
+ if len(form.Units) > 0 {
+ var units = make([]*models.TeamUnit, 0, len(form.Units))
+ unitTypes := models.FindUnitTypes(form.Units...)
+ for _, tp := range unitTypes {
+ units = append(units, &models.TeamUnit{
+ OrgID: ctx.Org.Team.OrgID,
+ Type: tp,
+ })
+ }
+ team.Units = units
  }
- team.Units = units
  }
 
  if err := models.UpdateTeam(team, isAuthChanged, isIncludeAllChanged); err != nil {