Skip to content

Commit e57024f

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent f58f5bb commit e57024f

File tree

9 files changed

+44
-19
lines changed

9 files changed

+44
-19
lines changed

‎models/actions/artifact.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ type FindArtifactsOptions struct {
114114
Status int
115115
}
116116

117+
func (opts FindArtifactsOptions) ToOrders() string {
118+
return "id"
119+
}
120+
121+
var _ db.FindOptionsOrder = (*FindArtifactsOptions)(nil)
122+
117123
func (opts FindArtifactsOptions) ToConds() builder.Cond {
118124
cond := builder.NewCond()
119125
if opts.RepoID > 0 {
@@ -132,7 +138,7 @@ func (opts FindArtifactsOptions) ToConds() builder.Cond {
132138
return cond
133139
}
134140

135-
// ActionArtifactMeta is the meta data of an artifact
141+
// ActionArtifactMeta is the meta-data of an artifact
136142
type ActionArtifactMeta struct {
137143
ArtifactName string
138144
FileSize int64

‎modules/util/slice.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,10 @@ func KeysOfMap[K comparable, V any](m map[K]V) []K {
7171
}
7272
return keys
7373
}
74+
75+
func SliceNilAsEmpty[T any](a []T) []T {
76+
if a == nil {
77+
return []T{}
78+
}
79+
return a
80+
}

‎routers/common/codesearch.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func PrepareCodeSearch(ctx *context.Context) (ret struct {
2525
}
2626
isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(fuzzyDefault)
2727
if isFuzzy && !fuzzyAllow {
28-
ctx.Flash.Info("Fuzzy search is disabled by default due to performance reasons")
28+
ctx.Flash.Info("Fuzzy search is disabled by default due to performance reasons", true)
2929
isFuzzy = false
3030
}
3131

‎routers/web/repo/issue_new.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,13 +276,16 @@ func ValidateRepoMetasForNewIssue(ctx *context.Context, form forms.CreateIssueFo
276276
}
277277
pageMetaData.ProjectsData.SelectedProjectID = form.ProjectID
278278

279+
// prepare assignees
279280
candidateAssignees := toSet(pageMetaData.AssigneesData.CandidateAssignees, func(user *user_model.User) int64 { return user.ID })
280281
inputAssigneeIDs, _ := base.StringsToInt64s(strings.Split(form.AssigneeIDs, ","))
281-
if len(inputAssigneeIDs) > 0 && !candidateAssignees.Contains(inputAssigneeIDs...) {
282-
ctx.NotFound("", nil)
283-
return ret
282+
var assigneeIDStrings []string
283+
for _, inputAssigneeID := range inputAssigneeIDs {
284+
if candidateAssignees.Contains(inputAssigneeID) {
285+
assigneeIDStrings = append(assigneeIDStrings, strconv.FormatInt(inputAssigneeID, 10))
286+
}
284287
}
285-
pageMetaData.AssigneesData.SelectedAssigneeIDs = form.AssigneeIDs
288+
pageMetaData.AssigneesData.SelectedAssigneeIDs = strings.Join(assigneeIDStrings, ",")
286289

287290
// Check if the passed reviewers (user/team) actually exist
288291
var reviewers []*user_model.User

‎services/convert/issue.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func toIssue(ctx context.Context, doer *user_model.User, issue *issues_model.Iss
6767
if err := issue.LoadLabels(ctx); err != nil {
6868
return &api.Issue{}
6969
}
70-
apiIssue.Labels = ToLabelList(issue.Labels, issue.Repo, issue.Repo.Owner)
70+
apiIssue.Labels = util.SliceNilAsEmpty(ToLabelList(issue.Labels, issue.Repo, issue.Repo.Owner))
7171
apiIssue.Repo = &api.RepositoryMeta{
7272
ID: issue.Repo.ID,
7373
Name: issue.Repo.Name,

‎services/convert/pull.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"code.gitea.io/gitea/modules/gitrepo"
1919
"code.gitea.io/gitea/modules/log"
2020
api "code.gitea.io/gitea/modules/structs"
21+
"code.gitea.io/gitea/modules/util"
2122
)
2223

2324
// ToAPIPullRequest assumes following fields have been assigned with valid values:
@@ -77,7 +78,7 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
7778
Labels: apiIssue.Labels,
7879
Milestone: apiIssue.Milestone,
7980
Assignee: apiIssue.Assignee,
80-
Assignees: apiIssue.Assignees,
81+
Assignees: util.SliceNilAsEmpty(apiIssue.Assignees),
8182
State: apiIssue.State,
8283
Draft: pr.IsWorkInProgress(ctx),
8384
IsLocked: apiIssue.IsLocked,
@@ -94,6 +95,9 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
9495
Updated: pr.Issue.UpdatedUnix.AsTimePtr(),
9596
PinOrder: apiIssue.PinOrder,
9697

98+
RequestedReviewers: []*api.User{},
99+
RequestedReviewersTeams: []*api.Team{},
100+
97101
AllowMaintainerEdit: pr.AllowMaintainerEdit,
98102

99103
Base: &api.PRBranchInfo{

‎services/convert/repository.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
unit_model "code.gitea.io/gitea/models/unit"
1515
"code.gitea.io/gitea/modules/log"
1616
api "code.gitea.io/gitea/modules/structs"
17+
"code.gitea.io/gitea/modules/util"
1718
)
1819

1920
// ToRepo converts a Repository to api.Repository
@@ -242,7 +243,7 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR
242243
MirrorInterval: mirrorInterval,
243244
MirrorUpdated: mirrorUpdated,
244245
RepoTransfer: transfer,
245-
Topics: repo.Topics,
246+
Topics: util.SliceNilAsEmpty(repo.Topics),
246247
ObjectFormatName: repo.ObjectFormatName,
247248
Licenses: repoLicenses.StringList(),
248249
}

‎services/mirror/mirror_push.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"code.gitea.io/gitea/modules/lfs"
1919
"code.gitea.io/gitea/modules/log"
2020
"code.gitea.io/gitea/modules/process"
21+
"code.gitea.io/gitea/modules/proxy"
2122
"code.gitea.io/gitea/modules/repository"
2223
"code.gitea.io/gitea/modules/setting"
2324
"code.gitea.io/gitea/modules/timeutil"
@@ -161,11 +162,13 @@ func runPushSync(ctx context.Context, m *repo_model.PushMirror) error {
161162

162163
log.Trace("Pushing %s mirror[%d] remote %s", path, m.ID, m.RemoteName)
163164

165+
envs := proxy.EnvWithProxy(remoteURL.URL)
164166
if err := git.Push(ctx, path, git.PushOptions{
165167
Remote: m.RemoteName,
166168
Force: true,
167169
Mirror: true,
168170
Timeout: timeout,
171+
Env: envs,
169172
}); err != nil {
170173
log.Error("Error pushing %s mirror[%d] remote %s: %v", path, m.ID, m.RemoteName, err)
171174

‎services/repository/adopt.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ func AdoptRepository(ctx context.Context, doer, u *user_model.User, opts CreateR
5252
IsEmpty: !opts.AutoInit,
5353
}
5454

55+
repoPath := repo_model.RepoPath(u.Name, repo.Name)
56+
5557
if err := db.WithTx(ctx, func(ctx context.Context) error {
56-
repoPath := repo_model.RepoPath(u.Name, repo.Name)
5758
isExist, err := util.IsExist(repoPath)
5859
if err != nil {
5960
log.Error("Unable to check if %s exists. Error: %v", repoPath, err)
@@ -75,7 +76,12 @@ func AdoptRepository(ctx context.Context, doer, u *user_model.User, opts CreateR
7576
if repo, err = repo_model.GetRepositoryByID(ctx, repo.ID); err != nil {
7677
return fmt.Errorf("getRepositoryByID: %w", err)
7778
}
79+
return nil
80+
}); err != nil {
81+
return nil, err
82+
}
7883

84+
if err := func() error {
7985
if err := adoptRepository(ctx, repoPath, repo, opts.DefaultBranch); err != nil {
8086
return fmt.Errorf("adoptRepository: %w", err)
8187
}
@@ -84,23 +90,18 @@ func AdoptRepository(ctx context.Context, doer, u *user_model.User, opts CreateR
8490
return fmt.Errorf("checkDaemonExportOK: %w", err)
8591
}
8692

87-
// Initialize Issue Labels if selected
88-
if len(opts.IssueLabels) > 0 {
89-
if err := repo_module.InitializeLabels(ctx, repo.ID, opts.IssueLabels, false); err != nil {
90-
return fmt.Errorf("InitializeLabels: %w", err)
91-
}
92-
}
93-
9493
if stdout, _, err := git.NewCommand(ctx, "update-server-info").
9594
RunStdString(&git.RunOpts{Dir: repoPath}); err != nil {
9695
log.Error("CreateRepository(git update-server-info) in %v: Stdout: %s\nError: %v", repo, stdout, err)
9796
return fmt.Errorf("CreateRepository(git update-server-info): %w", err)
9897
}
9998
return nil
100-
}); err != nil {
99+
}(); err != nil {
100+
if errDel := DeleteRepository(ctx, doer, repo, false /* no notify */); errDel != nil {
101+
log.Error("Failed to delete adopt-failed repository %s: %v", repo.FullName(), errDel)
102+
}
101103
return nil, err
102104
}
103-
104105
notify_service.AdoptRepository(ctx, doer, u, repo)
105106

106107
return repo, nil

0 commit comments

Comments
 (0)