diff options
| author | Norwin <noerw@users.noreply.github.com> | 2021-03-16 01:00:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-16 02:00:52 +0100 |
| commit | f4629fc472338e935b77f32b8d9dc5793937203a (patch) | |
| tree | 72e776758b82efb3ddeb32d9670fd4937cd96b4d /routers | |
| parent | ad42adac9393419338cb0e2850056f0cd81ec438 (diff) | |
| download | gitea-f4629fc472338e935b77f32b8d9dc5793937203a.tar.gz gitea-f4629fc472338e935b77f32b8d9dc5793937203a.zip | |
Move repo.CloseIssuesViaCommitInAnyBranch to issue settings (#14965)
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/repo/setting.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 6b31ac4c71..3c7524e4e6 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -216,6 +216,7 @@ func SettingsPost(ctx *context.Context) { ctx.Redirect(repo.Link() + "/settings") case "advanced": + var repoChanged bool var units []models.RepoUnit var deleteUnitTypes []models.UnitType @@ -223,6 +224,11 @@ func SettingsPost(ctx *context.Context) { // as an error on the UI for this action ctx.Data["Err_RepoName"] = nil + if repo.CloseIssuesViaCommitInAnyBranch != form.EnableCloseIssuesViaCommitInAnyBranch { + repo.CloseIssuesViaCommitInAnyBranch = form.EnableCloseIssuesViaCommitInAnyBranch + repoChanged = true + } + if form.EnableWiki && form.EnableExternalWiki && !models.UnitTypeExternalWiki.UnitGlobalDisabled() { if !validation.IsValidExternalURL(form.ExternalWikiURL) { ctx.Flash.Error(ctx.Tr("repo.settings.external_wiki_url_error")) @@ -326,6 +332,12 @@ func SettingsPost(ctx *context.Context) { ctx.ServerError("UpdateRepositoryUnits", err) return } + if repoChanged { + if err := models.UpdateRepository(repo, false); err != nil { + ctx.ServerError("UpdateRepository", err) + return + } + } log.Trace("Repository advanced settings updated: %s/%s", ctx.Repo.Owner.Name, repo.Name) ctx.Flash.Success(ctx.Tr("repo.settings.update_settings_success")) @@ -361,10 +373,6 @@ func SettingsPost(ctx *context.Context) { repo.IsFsckEnabled = form.EnableHealthCheck } - if repo.CloseIssuesViaCommitInAnyBranch != form.EnableCloseIssuesViaCommitInAnyBranch { - repo.CloseIssuesViaCommitInAnyBranch = form.EnableCloseIssuesViaCommitInAnyBranch - } - if err := models.UpdateRepository(repo, false); err != nil { ctx.ServerError("UpdateRepository", err) return |