Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

show only opened milestones on issues page milestone filter #5051

Merged
merged 13 commits into from
Nov 26, 2018
Merged

show only opened milestones on issues page milestone filter #5051

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
75b850a
show only opened milestones on issues page milestone filter
adelowo Oct 9, 2018
2a88140
update Godoc
adelowo Oct 11, 2018
b67a608
Merge branch 'master' of https://github.com/go-gitea/gitea into dont_…
adelowo Oct 11, 2018
2877703
update Godoc everywhere
adelowo Oct 11, 2018
c80cbe7
Merge branch 'master' into dont_show_closed_milestone_on_issue_filter…
adelowo Oct 12, 2018
4a7eec7
Merge branch 'master' into dont_show_closed_milestone_on_issue_filter…
adelowo Oct 12, 2018
b1510db
update swagger
adelowo Oct 17, 2018
4630a84
use false instead of 0
adelowo Nov 2, 2018
5454508
Merge branch 'master' into dont_show_closed_milestone_on_issue_filter…
lafriks Nov 2, 2018
d2c81af
Add seccond ordering by ID for milestones where no deadline is set
lafriks Nov 2, 2018
7e324d8
Merge branch 'master' into dont_show_closed_milestone_on_issue_filter…
adelowo Nov 8, 2018
a514f05
Merge branch 'master' into dont_show_closed_milestone_on_issue_filter…
techknowlogick Nov 26, 2018
e13447f
Merge branch 'master' into dont_show_closed_milestone_on_issue_filter…
techknowlogick Nov 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions models/issue_milestone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,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, 0).
adelowo marked this conversation as resolved.
Show resolved Hide resolved
adelowo marked this conversation as resolved.
Show resolved Hide resolved
Asc("deadline_unix").Find(&miles)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should sort by deadline and then also by id as deadline is optional

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if I understand this.........

Copy link
Member

@lafriks lafriks Oct 14, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Asc("deadline_unix").Asc("id")

}

// 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
View file
Open in desktop
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