From 75b850a2d5463d89893c1bf380468ff72e7e7e4f Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Tue, 9 Oct 2018 15:07:35 +0100 Subject: [PATCH 1/6] show only opened milestones on issues page milestone filter --- models/issue_milestone.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/issue_milestone.go b/models/issue_milestone.go index a84522a6d1a46..d3217f0b9abcc 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -181,7 +181,8 @@ func (milestones MilestoneList) getMilestoneIDs() []int64 { // GetMilestonesByRepoID returns all 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, 0). + Asc("deadline_unix").Find(&miles) } // GetMilestones returns a list of milestones of given repository and status. From 2a88140b4af80a8f220676e1539b30ebae5cc135 Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Thu, 11 Oct 2018 12:06:55 +0100 Subject: [PATCH 2/6] update Godoc --- models/issue_milestone.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issue_milestone.go b/models/issue_milestone.go index d3217f0b9abcc..f8657f9bb082a 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -178,7 +178,7 @@ 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 = ? AND is_closed = ?", repoID, 0). From 28777035ceb2e8a6551d959f7bac64e519e6c1fc Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Thu, 11 Oct 2018 17:57:12 +0100 Subject: [PATCH 3/6] update Godoc everywhere --- routers/api/v1/repo/milestone.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index a138cb7a69a0c..f36c8135e08ec 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: From b1510dbf7c726f739df0bc510b75124f06b32341 Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Wed, 17 Oct 2018 17:53:38 +0100 Subject: [PATCH 4/6] update swagger --- templates/swagger/v1_json.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 18fb34ff4525e..7a184608703fc 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -2972,7 +2972,7 @@ "tags": [ "issue" ], - "summary": "Get all of a repository's milestones", + "summary": "Get all of a repository's opened milestones", "operationId": "issueGetMilestonesList", "parameters": [ { From 4630a8424b9a9d7cc37919ef94bdb89bd5cade77 Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Fri, 2 Nov 2018 01:43:36 +0100 Subject: [PATCH 5/6] use false instead of 0 --- models/issue_milestone.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/models/issue_milestone.go b/models/issue_milestone.go index f8657f9bb082a..257221b1db9d8 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" ) @@ -181,7 +180,7 @@ func (milestones MilestoneList) getMilestoneIDs() []int64 { // 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 = ? AND is_closed = ?", repoID, 0). + return miles, x.Where("repo_id = ? AND is_closed = ?", repoID, false). Asc("deadline_unix").Find(&miles) } From d2c81af49bb849279bd2f55a39bb77f2e2ae70fd Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Fri, 2 Nov 2018 09:17:31 +0200 Subject: [PATCH 6/6] Add seccond ordering by ID for milestones where no deadline is set --- models/issue_milestone.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issue_milestone.go b/models/issue_milestone.go index 257221b1db9d8..ead3e5a4f65df 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -181,7 +181,7 @@ func (milestones MilestoneList) getMilestoneIDs() []int64 { func GetMilestonesByRepoID(repoID int64) (MilestoneList, error) { miles := make([]*Milestone, 0, 10) return miles, x.Where("repo_id = ? AND is_closed = ?", repoID, false). - Asc("deadline_unix").Find(&miles) + Asc("deadline_unix").Asc("id").Find(&miles) } // GetMilestones returns a list of milestones of given repository and status.