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

diff --git a/models/issue_milestone.go b/models/issue_milestone.go
index a84522a6d1a46a7bb0716e0a63db0aaee2c3fd4e..ead3e5a4f65df1455821171230f2c4182aa4e99d 100644 (file)
--- 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 c621536ad720cc18944049e325e97d25a33ba6a7..88386c3efafa4de38d9588b21c052334768c1c7b 100644 (file)
--- 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 dada2c98e390175a619057a6ed89f4b5e786e72f..8befe64f89ccc219c6e838715a7fc8da01dc7b83 100644 (file)
--- 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": [
           {