Skip to content

Commit 5e022a9

Browse files
adelowolunny
authored andcommitted
show only opened milestones on issues page milestone filter (#5051)
* show only opened milestones on issues page milestone filter * update Godoc * update Godoc everywhere * update swagger * use false instead of 0 * Add seccond ordering by ID for milestones where no deadline is set
1 parent d9b0b7f commit 5e022a9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

models/issue_milestone.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"code.gitea.io/gitea/modules/setting"
1212
"code.gitea.io/gitea/modules/util"
1313
api "code.gitea.io/sdk/gitea"
14-
1514
"github.com/go-xorm/xorm"
1615
)
1716

@@ -178,10 +177,11 @@ func (milestones MilestoneList) getMilestoneIDs() []int64 {
178177
return ids
179178
}
180179

181-
// GetMilestonesByRepoID returns all milestones of a repository.
180+
// GetMilestonesByRepoID returns all opened milestones of a repository.
182181
func GetMilestonesByRepoID(repoID int64) (MilestoneList, error) {
183182
miles := make([]*Milestone, 0, 10)
184-
return miles, x.Where("repo_id = ?", repoID).Asc("deadline_unix").Find(&miles)
183+
return miles, x.Where("repo_id = ? AND is_closed = ?", repoID, false).
184+
Asc("deadline_unix").Asc("id").Find(&miles)
185185
}
186186

187187
// GetMilestones returns a list of milestones of given repository and status.

routers/api/v1/repo/milestone.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
api "code.gitea.io/sdk/gitea"
1515
)
1616

17-
// ListMilestones list all the milestones for a repository
17+
// ListMilestones list all the opened milestones for a repository
1818
func ListMilestones(ctx *context.APIContext) {
1919
// swagger:operation GET /repos/{owner}/{repo}/milestones issue issueGetMilestonesList
2020
// ---
21-
// summary: Get all of a repository's milestones
21+
// summary: Get all of a repository's opened milestones
2222
// produces:
2323
// - application/json
2424
// parameters:

templates/swagger/v1_json.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3065,7 +3065,7 @@
30653065
"tags": [
30663066
"issue"
30673067
],
3068-
"summary": "Get all of a repository's milestones",
3068+
"summary": "Get all of a repository's opened milestones",
30693069
"operationId": "issueGetMilestonesList",
30703070
"parameters": [
30713071
{

0 commit comments

Comments
 (0)