tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-21 12:55:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/bots

Browse Source
This commit is contained in:
Jason Song 2022-12-06 16:39:06 +08:00 committed by GitHub
commit ab0a60e56a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
models/issues/issue.go
View File

@ -997,12 +997,7 @@ func NewIssueWithIndex(ctx context.Context, doer *user_model.User, opts NewIssue
}
}
if opts.IsPull {
_, err = e.Exec("UPDATE `repository` SET num_pulls = num_pulls + 1 WHERE id = ?", opts.Issue.RepoID)
} else {
_, err = e.Exec("UPDATE `repository` SET num_issues = num_issues + 1 WHERE id = ?", opts.Issue.RepoID)
}
if err != nil {
if err := repo_model.UpdateRepoIssueNumbers(ctx, opts.Issue.RepoID, opts.IsPull, false); err != nil {
return err
}

4
models/repo.go
View File

@ -443,7 +443,7 @@ func CheckRepoStats(ctx context.Context) error {
},
// Repository.NumIssues
{
statsQuery("SELECT repo.id FROM `repository` repo WHERE repo.num_issues!=(SELECT COUNT(*) FROM `issue` WHERE repo_id=repo.id AND is_closed=? AND is_pull=?)", false, false),
statsQuery("SELECT repo.id FROM `repository` repo WHERE repo.num_issues!=(SELECT COUNT(*) FROM `issue` WHERE repo_id=repo.id AND is_pull=?)", false),
repoStatsCorrectNumIssues,
"repository count 'num_issues'",
},
@ -455,7 +455,7 @@ func CheckRepoStats(ctx context.Context) error {
},
// Repository.NumPulls
{
statsQuery("SELECT repo.id FROM `repository` repo WHERE repo.num_pulls!=(SELECT COUNT(*) FROM `issue` WHERE repo_id=repo.id AND is_closed=? AND is_pull=?)", false, true),
statsQuery("SELECT repo.id FROM `repository` repo WHERE repo.num_pulls!=(SELECT COUNT(*) FROM `issue` WHERE repo_id=repo.id AND is_pull=?)", true),
repoStatsCorrectNumPulls,
"repository count 'num_pulls'",
},

9
services/issue/issue.go
View File

@ -218,9 +218,16 @@ func deleteIssue(issue *issues_model.Issue) error {
return err
}
if err := repo_model.UpdateRepoIssueNumbers(ctx, issue.RepoID, issue.IsPull, issue.IsClosed); err != nil {
// update the total issue numbers
if err := repo_model.UpdateRepoIssueNumbers(ctx, issue.RepoID, issue.IsPull, false); err != nil {
return err
}
// if the issue is closed, update the closed issue numbers
if issue.IsClosed {
if err := repo_model.UpdateRepoIssueNumbers(ctx, issue.RepoID, issue.IsPull, true); err != nil {
return err
}
}
if err := issues_model.UpdateMilestoneCounters(ctx, issue.MilestoneID); err != nil {
return fmt.Errorf("error updating counters for milestone id %d: %w",

1
templates/org/create.tmpl
View File

@ -48,7 +48,6 @@
<button class="ui green button">
{{.locale.Tr "org.create_org"}}
</button>
<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
</div>
</div>
</form>

1
templates/org/team/new.tmpl
View File

@ -134,7 +134,6 @@
<div class="field">
{{if .PageIsOrgTeamsNew}}
<button class="ui green button">{{.locale.Tr "org.create_team"}}</button>
<a class="ui button" href="{{.OrgLink}}/teams">{{.locale.Tr "cancel"}}</a>
{{else}}
<button class="ui green button">{{.locale.Tr "org.teams.update_settings"}}</button>
{{if not (eq .Team.LowerName "owners")}}

1
templates/repo/migrate/codebase.tmpl
View File

@ -107,7 +107,6 @@
<button class="ui green button">
{{.locale.Tr "repo.migrate_repo"}}
</button>
<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
</div>
</div>
</form>

1
templates/repo/migrate/git.tmpl
View File

@ -81,7 +81,6 @@
<button class="ui green button">
{{.locale.Tr "repo.migrate_repo"}}
</button>
<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
</div>
</div>
</form>

1
templates/repo/migrate/gitbucket.tmpl
View File

@ -123,7 +123,6 @@
<button class="ui green button">
{{.locale.Tr "repo.migrate_repo"}}
</button>
<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
</div>
</div>
</form>

1
templates/repo/migrate/gitea.tmpl
View File

@ -119,7 +119,6 @@
<button class="ui green button">
{{.locale.Tr "repo.migrate_repo"}}
</button>
<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
</div>
</div>
</form>

1
templates/repo/migrate/github.tmpl
View File

@ -121,7 +121,6 @@
<button class="ui green button">
{{.locale.Tr "repo.migrate_repo"}}
</button>
<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
</div>
</div>
</form>

1
templates/repo/migrate/gitlab.tmpl
View File

@ -118,7 +118,6 @@
<button class="ui green button">
{{.locale.Tr "repo.migrate_repo"}}
</button>
<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
</div>
</div>
</form>

1
templates/repo/migrate/gogs.tmpl
View File

@ -121,7 +121,6 @@
<button class="ui green button">
{{.locale.Tr "repo.migrate_repo"}}
</button>
<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
</div>
</div>
</form>

1
templates/repo/migrate/onedev.tmpl
View File

@ -107,7 +107,6 @@
<button class="ui green button">
{{.locale.Tr "repo.migrate_repo"}}
</button>
<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
</div>
</div>
</form>

1
templates/repo/pulls/fork.tmpl
View File

@ -61,7 +61,6 @@
<button class="ui green button">
{{.locale.Tr "repo.fork_repo"}}
</button>
<a class="ui button" href="{{.ForkRepo.Link}}">{{.locale.Tr "cancel"}}</a>
</div>
</div>
</form>

1
templates/user/project.tmpl
View File

@ -60,7 +60,6 @@
<button class="ui green button">
{{.locale.Tr "repo.projects.create"}}
</button>
<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
</div>
</div>
</form>