Merge branch 'main' into feature/bots

models/issues/issue.go

@@ -997,12 +997,7 @@ func NewIssueWithIndex(ctx context.Context, doer *user_model.User, opts NewIssue
 		}
 	}
 
-	if opts.IsPull {
+	if err := repo_model.UpdateRepoIssueNumbers(ctx, opts.Issue.RepoID, opts.IsPull, false); err != nil {
-		_, 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 {
 		return err
 	}
 

models/repo.go

@@ -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'",
 		},

services/issue/issue.go

@@ -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",

templates/org/create.tmpl

@@ -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>

templates/org/team/new.tmpl

@@ -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")}}

templates/repo/migrate/codebase.tmpl

@@ -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>

templates/repo/migrate/git.tmpl

@@ -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>

templates/repo/migrate/gitbucket.tmpl

@@ -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>

templates/repo/migrate/gitea.tmpl

@@ -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>

templates/repo/migrate/github.tmpl

@@ -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>

templates/repo/migrate/gitlab.tmpl

@@ -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>

templates/repo/migrate/gogs.tmpl

@@ -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>

templates/repo/migrate/onedev.tmpl

@@ -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>

templates/repo/pulls/fork.tmpl

@@ -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>

templates/user/project.tmpl

@@ -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>