|
|
@ -232,7 +232,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti |
|
|
|
Page: pager.Paginater.Current(), |
|
|
|
Page: pager.Paginater.Current(), |
|
|
|
PageSize: setting.UI.IssuePagingNum, |
|
|
|
PageSize: setting.UI.IssuePagingNum, |
|
|
|
}, |
|
|
|
}, |
|
|
|
RepoIDs: []int64{repo.ID}, |
|
|
|
RepoID: repo.ID, |
|
|
|
AssigneeID: assigneeID, |
|
|
|
AssigneeID: assigneeID, |
|
|
|
PosterID: posterID, |
|
|
|
PosterID: posterID, |
|
|
|
MentionedID: mentionedID, |
|
|
|
MentionedID: mentionedID, |
|
|
@ -2167,6 +2167,7 @@ func SearchIssues(ctx *context.Context) { |
|
|
|
opts.TeamID = team.ID |
|
|
|
opts.TeamID = team.ID |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
repoCond := models.SearchRepositoryCondition(opts) |
|
|
|
repoIDs, _, err := models.SearchRepositoryIDs(opts) |
|
|
|
repoIDs, _, err := models.SearchRepositoryIDs(opts) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
ctx.Error(http.StatusInternalServerError, "SearchRepositoryByName", err.Error()) |
|
|
|
ctx.Error(http.StatusInternalServerError, "SearchRepositoryByName", err.Error()) |
|
|
@ -2227,7 +2228,7 @@ func SearchIssues(ctx *context.Context) { |
|
|
|
Page: ctx.FormInt("page"), |
|
|
|
Page: ctx.FormInt("page"), |
|
|
|
PageSize: limit, |
|
|
|
PageSize: limit, |
|
|
|
}, |
|
|
|
}, |
|
|
|
RepoIDs: repoIDs, |
|
|
|
RepoCond: repoCond, |
|
|
|
IsClosed: isClosed, |
|
|
|
IsClosed: isClosed, |
|
|
|
IssueIDs: issueIDs, |
|
|
|
IssueIDs: issueIDs, |
|
|
|
IncludedLabelNames: includedLabelNames, |
|
|
|
IncludedLabelNames: includedLabelNames, |
|
|
@ -2403,7 +2404,7 @@ func ListIssues(ctx *context.Context) { |
|
|
|
if len(keyword) == 0 || len(issueIDs) > 0 || len(labelIDs) > 0 { |
|
|
|
if len(keyword) == 0 || len(issueIDs) > 0 || len(labelIDs) > 0 { |
|
|
|
issuesOpt := &models.IssuesOptions{ |
|
|
|
issuesOpt := &models.IssuesOptions{ |
|
|
|
ListOptions: listOptions, |
|
|
|
ListOptions: listOptions, |
|
|
|
RepoIDs: []int64{ctx.Repo.Repository.ID}, |
|
|
|
RepoID: ctx.Repo.Repository.ID, |
|
|
|
IsClosed: isClosed, |
|
|
|
IsClosed: isClosed, |
|
|
|
IssueIDs: issueIDs, |
|
|
|
IssueIDs: issueIDs, |
|
|
|
LabelIDs: labelIDs, |
|
|
|
LabelIDs: labelIDs, |
|
|
|