lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rewrite existing repo units if setting is not included in api body (#7763) 

* Rewrite existing repo units if setting is not included in api body

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>

* else-if on one row
release/v1.15
David Svantesson 2019-08-10 11:32:46 +02:00 committed by Lauris BH
parent 2ed21e7e09
commit cde95f9923
1 changed files with 89 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
routers/api/v1/repo/repo.go
View File

@ -651,8 +651,14 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
}) })
} }
if opts.HasIssues != nil { if opts.HasIssues == nil {
if *opts.HasIssues { // If HasIssues setting not touched, rewrite existing repo unit
if unit, err := repo.GetUnit(models.UnitTypeIssues); err == nil {
units = append(units, *unit)
} else if unit, err := repo.GetUnit(models.UnitTypeExternalTracker); err == nil {
units = append(units, *unit)
}
} else if *opts.HasIssues {
// We don't currently allow setting individual issue settings through the API, // We don't currently allow setting individual issue settings through the API,
// only can enable/disable issues, so when enabling issues, // only can enable/disable issues, so when enabling issues,
// we either get the existing config which means it was already enabled, // we either get the existing config which means it was already enabled,
@ -675,10 +681,15 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
Config: config, Config: config,
}) })
} }
}
if opts.HasWiki != nil { if opts.HasWiki == nil {
if *opts.HasWiki { // If HasWiki setting not touched, rewrite existing repo unit
if unit, err := repo.GetUnit(models.UnitTypeWiki); err == nil {
units = append(units, *unit)
} else if unit, err := repo.GetUnit(models.UnitTypeExternalWiki); err == nil {
units = append(units, *unit)
}
} else if *opts.HasWiki {
// We don't currently allow setting individual wiki settings through the API, // We don't currently allow setting individual wiki settings through the API,
// only can enable/disable the wiki, so when enabling the wiki, // only can enable/disable the wiki, so when enabling the wiki,
// we either get the existing config which means it was already enabled, // we either get the existing config which means it was already enabled,
@ -690,10 +701,13 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
Config: config, Config: config,
}) })
} }
}
if opts.HasPullRequests != nil { if opts.HasPullRequests == nil {
if *opts.HasPullRequests { // If HasPullRequest setting not touched, rewrite existing repo unit
if unit, err := repo.GetUnit(models.UnitTypePullRequests); err == nil {
units = append(units, *unit)
}
} else if *opts.HasPullRequests {
// We do allow setting individual PR settings through the API, so // We do allow setting individual PR settings through the API, so
// we get the config settings and then set them // we get the config settings and then set them
// if those settings were provided in the opts. // if those settings were provided in the opts.
@ -734,7 +748,6 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
Config: config, Config: config,
}) })
} }
}
if err := models.UpdateRepositoryUnits(repo, units); err != nil { if err := models.UpdateRepositoryUnits(repo, units); err != nil {
ctx.Error(http.StatusInternalServerError, "UpdateRepositoryUnits", err) ctx.Error(http.StatusInternalServerError, "UpdateRepositoryUnits", err)