diff options
| author | Lanre Adelowo <adelowomailbox@gmail.com> | 2018-11-26 09:45:42 +0100 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2018-11-26 16:45:42 +0800 |
| commit | 5e022a98e6429d08e3a32e10fa7ba98566ab71a1 (patch) | |
| tree | b3a396bfbc3660b6037aa01c5029b2ff5b63fc4b | |
| parent | d9b0b7f56ed13077fbb6f3b76f93aca582d3cfcd (diff) | |
| download | gitea-5e022a98e6429d08e3a32e10fa7ba98566ab71a1.tar.gz gitea-5e022a98e6429d08e3a32e10fa7ba98566ab71a1.zip | |
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
| -rw-r--r-- | models/issue_milestone.go | 6 | ||||
| -rw-r--r-- | routers/api/v1/repo/milestone.go | 4 | ||||
| -rw-r--r-- | templates/swagger/v1_json.tmpl | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/models/issue_milestone.go b/models/issue_milestone.go index a84522a6d1..ead3e5a4f6 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -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" ) @@ -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. diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index c621536ad7..88386c3efa 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -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: diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index dada2c98e3..8befe64f89 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -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": [ { |