Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 7 commits into from
Aug 10, 2019
Merged

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

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
58f63b9
Rewrite existing repo units if setting is not included in api body
davidsvantesson Aug 5, 2019
eccdcf7
Merge branch 'master' into 7758-api-repo-rewrite-unchanged-units
davidsvantesson Aug 5, 2019
c95fc9b
else-if on one row
davidsvantesson Aug 5, 2019
1ae9c3c
Merge branch 'master' into 7758-api-repo-rewrite-unchanged-units
lunny Aug 6, 2019
aae87bd
Merge branch 'master' into 7758-api-repo-rewrite-unchanged-units
lunny Aug 6, 2019
2a742b7
Merge branch 'master' into 7758-api-repo-rewrite-unchanged-units
techknowlogick Aug 8, 2019
30b8d04
Merge branch 'master' into 7758-api-repo-rewrite-unchanged-units
davidsvantesson Aug 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions routers/api/v1/repo/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,14 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
})
}

if opts.HasIssues != nil {
if opts.HasIssues == nil {
// 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 {
davidsvantesson marked this conversation as resolved.
Show resolved Hide resolved
if *opts.HasIssues {
// We don't currently allow setting individual issue settings through the API,
// only can enable/disable issues, so when enabling issues,
Expand All @@ -677,7 +684,14 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
}
}

if opts.HasWiki != nil {
if opts.HasWiki == nil {
// 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 {
davidsvantesson marked this conversation as resolved.
Show resolved Hide resolved
if *opts.HasWiki {
// We don't currently allow setting individual wiki settings through the API,
// only can enable/disable the wiki, so when enabling the wiki,
Expand All @@ -692,7 +706,12 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
}
}

if opts.HasPullRequests != nil {
if opts.HasPullRequests == nil {
// If HasPullRequest setting not touched, rewrite existing repo unit
if unit, err := repo.GetUnit(models.UnitTypePullRequests); err == nil {
units = append(units, *unit)
}
} else {
davidsvantesson marked this conversation as resolved.
Show resolved Hide resolved
if *opts.HasPullRequests {
// We do allow setting individual PR settings through the API, so
// we get the config settings and then set them
Expand Down