Skip to content

Commit

Permalink
show only opened milestones on issues page milestone filter (#5051)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
adelowo authored and lunny committed Nov 26, 2018
1 parent d9b0b7f commit 5e022a9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions models/issue_milestone.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
api "code.gitea.io/sdk/gitea"

"github.com/go-xorm/xorm"
)

Expand Down Expand Up @@ -178,10 +177,11 @@ func (milestones MilestoneList) getMilestoneIDs() []int64 {
return ids
}

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

// GetMilestones returns a list of milestones of given repository and status.
Expand Down
4 changes: 2 additions & 2 deletions routers/api/v1/repo/milestone.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
api "code.gitea.io/sdk/gitea"
)

// ListMilestones list all the milestones for a repository
// ListMilestones list all the opened milestones for a repository
func ListMilestones(ctx *context.APIContext) {
// swagger:operation GET /repos/{owner}/{repo}/milestones issue issueGetMilestonesList
// ---
// summary: Get all of a repository's milestones
// summary: Get all of a repository's opened milestones
// produces:
// - application/json
// parameters:
Expand Down
2 changes: 1 addition & 1 deletion templates/swagger/v1_json.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3065,7 +3065,7 @@
"tags": [
"issue"
],
"summary": "Get all of a repository's milestones",
"summary": "Get all of a repository's opened milestones",
"operationId": "issueGetMilestonesList",
"parameters": [
{
Expand Down

0 comments on commit 5e022a9

Please sign in to comment.