From 2dc805c0c6e85099f3f346ba78f3a52abf032ce4 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 29 Nov 2018 09:46:30 +0800 Subject: [PATCH] Milestone issues and pull requests (#5293) * add milestone issues and pulls page instead of redirecting issues page * add milestone when creating issue from milestone page * refactor to merge similiar codes as a new function issues * remove milestone info on milestone issues list * fix missing params --- models/issue.go | 12 +- models/issue_milestone.go | 12 + options/locale/locale_en-US.ini | 1 + routers/repo/issue.go | 309 ++++----------------- routers/repo/milestone.go | 262 +++++++++++++++++ routers/routes/routes.go | 4 +- templates/repo/issue/milestone_issues.tmpl | 233 ++++++++++++++++ templates/repo/issue/milestones.tmpl | 2 +- 8 files changed, 573 insertions(+), 262 deletions(-) create mode 100644 routers/repo/milestone.go create mode 100644 templates/repo/issue/milestone_issues.tmpl diff --git a/models/issue.go b/models/issue.go index 26196274fe..d4222b04a0 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1401,7 +1401,7 @@ type IssueStatsOptions struct { AssigneeID int64 MentionedID int64 PosterID int64 - IsPull bool + IsPull util.OptionalBool IssueIDs []int64 } @@ -1411,8 +1411,7 @@ func GetIssueStats(opts *IssueStatsOptions) (*IssueStats, error) { countSession := func(opts *IssueStatsOptions) *xorm.Session { sess := x. - Where("issue.repo_id = ?", opts.RepoID). - And("issue.is_pull = ?", opts.IsPull) + Where("issue.repo_id = ?", opts.RepoID) if len(opts.IssueIDs) > 0 { sess.In("issue.id", opts.IssueIDs) @@ -1447,6 +1446,13 @@ func GetIssueStats(opts *IssueStatsOptions) (*IssueStats, error) { And("issue_user.is_mentioned = ?", true) } + switch opts.IsPull { + case util.OptionalBoolTrue: + sess.And("issue.is_pull=?", true) + case util.OptionalBoolFalse: + sess.And("issue.is_pull=?", false) + } + return sess } diff --git a/models/issue_milestone.go b/models/issue_milestone.go index 2e512d7ba4..6cb2b6b574 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -122,6 +122,18 @@ func GetMilestoneByRepoID(repoID, id int64) (*Milestone, error) { return getMilestoneByRepoID(x, repoID, id) } +// GetMilestoneByID returns the milestone via id . +func GetMilestoneByID(id int64) (*Milestone, error) { + var m Milestone + has, err := x.ID(id).Get(&m) + if err != nil { + return nil, err + } else if !has { + return nil, ErrMilestoneNotExist{id, 0} + } + return &m, nil +} + // MilestoneList is a list of milestones offering additional functionality type MilestoneList []*Milestone diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7f92be8147..7f2aa4450a 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -879,6 +879,7 @@ milestones.no_due_date = No due date milestones.open = Open milestones.close = Close milestones.new_subheader = Milestones organize issues and track progress. +milestones.completeness = %d%% Completed milestones.create = Create Milestone milestones.title = Title milestones.desc = Description diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 8d95f33940..34a01617e4 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -14,7 +14,6 @@ import ( "net/http" "strconv" "strings" - "time" "github.com/Unknwon/com" "github.com/Unknwon/paginater" @@ -37,10 +36,6 @@ const ( tplIssueNew base.TplName = "repo/issue/new" tplIssueView base.TplName = "repo/issue/view" - tplMilestone base.TplName = "repo/issue/milestones" - tplMilestoneNew base.TplName = "repo/issue/milestone_new" - tplMilestoneEdit base.TplName = "repo/issue/milestone_edit" - tplReactions base.TplName = "repo/issue/view_content/reactions" issueTemplateKey = "IssueTemplate" @@ -91,26 +86,8 @@ func MustAllowPulls(ctx *context.Context) { } } -// Issues render issues page -func Issues(ctx *context.Context) { - isPullList := ctx.Params(":type") == "pulls" - if isPullList { - MustAllowPulls(ctx) - if ctx.Written() { - return - } - ctx.Data["Title"] = ctx.Tr("repo.pulls") - ctx.Data["PageIsPullList"] = true - - } else { - MustEnableIssues(ctx) - if ctx.Written() { - return - } - ctx.Data["Title"] = ctx.Tr("repo.issues") - ctx.Data["PageIsIssueList"] = true - } - +func issues(ctx *context.Context, milestoneID int64, isPullOption util.OptionalBool) { + var err error viewType := ctx.Query("type") sortType := ctx.Query("sort") types := []string{"all", "your_repositories", "assigned", "created_by", "mentioned"} @@ -136,7 +113,7 @@ func Issues(ctx *context.Context) { repo := ctx.Repo.Repository selectLabels := ctx.Query("labels") - milestoneID := ctx.QueryInt64("milestone") + isShowClosed := ctx.Query("state") == "closed" keyword := strings.Trim(ctx.Query("q"), " ") @@ -145,7 +122,6 @@ func Issues(ctx *context.Context) { } var issueIDs []int64 - var err error if len(keyword) > 0 { issueIDs, err = indexer.SearchIssuesByKeyword(repo.ID, keyword) if len(issueIDs) == 0 { @@ -157,7 +133,6 @@ func Issues(ctx *context.Context) { if forceEmpty { issueStats = &models.IssueStats{} } else { - var err error issueStats, err = models.GetIssueStats(&models.IssueStatsOptions{ RepoID: repo.ID, Labels: selectLabels, @@ -165,7 +140,7 @@ func Issues(ctx *context.Context) { AssigneeID: assigneeID, MentionedID: mentionedID, PosterID: posterID, - IsPull: isPullList, + IsPull: isPullOption, IssueIDs: issueIDs, }) if err != nil { @@ -200,7 +175,7 @@ func Issues(ctx *context.Context) { Page: pager.Current(), PageSize: setting.UI.IssuePagingNum, IsClosed: util.OptionalBoolOf(isShowClosed), - IsPull: util.OptionalBoolOf(isPullList), + IsPull: isPullOption, Labels: selectLabels, SortType: sortType, IssueIDs: issueIDs, @@ -223,13 +198,6 @@ func Issues(ctx *context.Context) { } ctx.Data["Issues"] = issues - // Get milestones. - ctx.Data["Milestones"], err = models.GetMilestonesByRepoID(repo.ID) - if err != nil { - ctx.ServerError("GetAllRepoMilestones", err) - return - } - // Get assignees. ctx.Data["Assignees"], err = repo.GetAssignees() if err != nil { @@ -237,6 +205,13 @@ func Issues(ctx *context.Context) { return } + labels, err := models.GetLabelsByRepoID(repo.ID, "") + if err != nil { + ctx.ServerError("GetLabelsByRepoID", err) + return + } + ctx.Data["Labels"] = labels + if ctx.QueryInt64("assignee") == 0 { assigneeID = 0 // Reset ID to prevent unexpected selection of assignee. } @@ -254,6 +229,36 @@ func Issues(ctx *context.Context) { } else { ctx.Data["State"] = "open" } +} + +// Issues render issues page +func Issues(ctx *context.Context) { + isPullList := ctx.Params(":type") == "pulls" + if isPullList { + MustAllowPulls(ctx) + if ctx.Written() { + return + } + ctx.Data["Title"] = ctx.Tr("repo.pulls") + ctx.Data["PageIsPullList"] = true + } else { + MustEnableIssues(ctx) + if ctx.Written() { + return + } + ctx.Data["Title"] = ctx.Tr("repo.issues") + ctx.Data["PageIsIssueList"] = true + } + + issues(ctx, ctx.QueryInt64("milestone"), util.OptionalBoolOf(isPullList)) + + var err error + // Get milestones. + ctx.Data["Milestones"], err = models.GetMilestonesByRepoID(ctx.Repo.Repository.ID) + if err != nil { + ctx.ServerError("GetAllRepoMilestones", err) + return + } ctx.HTML(200, tplIssues) } @@ -358,6 +363,16 @@ func NewIssue(ctx *context.Context) { ctx.Data["RequireSimpleMDE"] = true ctx.Data["RequireTribute"] = true ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes + + milestoneID := ctx.QueryInt64("milestone") + milestone, err := models.GetMilestoneByID(milestoneID) + if err != nil { + log.Error(4, "GetMilestoneByID: %d: %v", milestoneID, err) + } else { + ctx.Data["milestone_id"] = milestoneID + ctx.Data["Milestone"] = milestone + } + setTemplateIfExists(ctx, issueTemplateKey, IssueTemplateCandidates) renderAttachmentSettings(ctx) @@ -1218,226 +1233,6 @@ func DeleteComment(ctx *context.Context) { ctx.Status(200) } -// Milestones render milestones page -func Milestones(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.milestones") - ctx.Data["PageIsIssueList"] = true - ctx.Data["PageIsMilestones"] = true - - isShowClosed := ctx.Query("state") == "closed" - openCount, closedCount, err := models.MilestoneStats(ctx.Repo.Repository.ID) - if err != nil { - ctx.ServerError("MilestoneStats", err) - return - } - ctx.Data["OpenCount"] = openCount - ctx.Data["ClosedCount"] = closedCount - - sortType := ctx.Query("sort") - page := ctx.QueryInt("page") - if page <= 1 { - page = 1 - } - - var total int - if !isShowClosed { - total = int(openCount) - } else { - total = int(closedCount) - } - ctx.Data["Page"] = paginater.New(total, setting.UI.IssuePagingNum, page, 5) - - miles, err := models.GetMilestones(ctx.Repo.Repository.ID, page, isShowClosed, sortType) - if err != nil { - ctx.ServerError("GetMilestones", err) - return - } - if ctx.Repo.Repository.IsTimetrackerEnabled() { - if miles.LoadTotalTrackedTimes(); err != nil { - ctx.ServerError("LoadTotalTrackedTimes", err) - return - } - } - for _, m := range miles { - m.RenderedContent = string(markdown.Render([]byte(m.Content), ctx.Repo.RepoLink, ctx.Repo.Repository.ComposeMetas())) - } - ctx.Data["Milestones"] = miles - - if isShowClosed { - ctx.Data["State"] = "closed" - } else { - ctx.Data["State"] = "open" - } - - ctx.Data["SortType"] = sortType - ctx.Data["IsShowClosed"] = isShowClosed - ctx.HTML(200, tplMilestone) -} - -// NewMilestone render creating milestone page -func NewMilestone(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.milestones.new") - ctx.Data["PageIsIssueList"] = true - ctx.Data["PageIsMilestones"] = true - ctx.Data["RequireDatetimepicker"] = true - ctx.Data["DateLang"] = setting.DateLang(ctx.Locale.Language()) - ctx.HTML(200, tplMilestoneNew) -} - -// NewMilestonePost response for creating milestone -func NewMilestonePost(ctx *context.Context, form auth.CreateMilestoneForm) { - ctx.Data["Title"] = ctx.Tr("repo.milestones.new") - ctx.Data["PageIsIssueList"] = true - ctx.Data["PageIsMilestones"] = true - ctx.Data["RequireDatetimepicker"] = true - ctx.Data["DateLang"] = setting.DateLang(ctx.Locale.Language()) - - if ctx.HasError() { - ctx.HTML(200, tplMilestoneNew) - return - } - - if len(form.Deadline) == 0 { - form.Deadline = "9999-12-31" - } - deadline, err := time.ParseInLocation("2006-01-02", form.Deadline, time.Local) - if err != nil { - ctx.Data["Err_Deadline"] = true - ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), tplMilestoneNew, &form) - return - } - - if err = models.NewMilestone(&models.Milestone{ - RepoID: ctx.Repo.Repository.ID, - Name: form.Title, - Content: form.Content, - DeadlineUnix: util.TimeStamp(deadline.Unix()), - }); err != nil { - ctx.ServerError("NewMilestone", err) - return - } - - ctx.Flash.Success(ctx.Tr("repo.milestones.create_success", form.Title)) - ctx.Redirect(ctx.Repo.RepoLink + "/milestones") -} - -// EditMilestone render edting milestone page -func EditMilestone(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.milestones.edit") - ctx.Data["PageIsMilestones"] = true - ctx.Data["PageIsEditMilestone"] = true - ctx.Data["RequireDatetimepicker"] = true - ctx.Data["DateLang"] = setting.DateLang(ctx.Locale.Language()) - - m, err := models.GetMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) - if err != nil { - if models.IsErrMilestoneNotExist(err) { - ctx.NotFound("", nil) - } else { - ctx.ServerError("GetMilestoneByRepoID", err) - } - return - } - ctx.Data["title"] = m.Name - ctx.Data["content"] = m.Content - if len(m.DeadlineString) > 0 { - ctx.Data["deadline"] = m.DeadlineString - } - ctx.HTML(200, tplMilestoneNew) -} - -// EditMilestonePost response for edting milestone -func EditMilestonePost(ctx *context.Context, form auth.CreateMilestoneForm) { - ctx.Data["Title"] = ctx.Tr("repo.milestones.edit") - ctx.Data["PageIsMilestones"] = true - ctx.Data["PageIsEditMilestone"] = true - ctx.Data["RequireDatetimepicker"] = true - ctx.Data["DateLang"] = setting.DateLang(ctx.Locale.Language()) - - if ctx.HasError() { - ctx.HTML(200, tplMilestoneNew) - return - } - - if len(form.Deadline) == 0 { - form.Deadline = "9999-12-31" - } - deadline, err := time.ParseInLocation("2006-01-02", form.Deadline, time.Local) - if err != nil { - ctx.Data["Err_Deadline"] = true - ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), tplMilestoneNew, &form) - return - } - - m, err := models.GetMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) - if err != nil { - if models.IsErrMilestoneNotExist(err) { - ctx.NotFound("", nil) - } else { - ctx.ServerError("GetMilestoneByRepoID", err) - } - return - } - m.Name = form.Title - m.Content = form.Content - m.DeadlineUnix = util.TimeStamp(deadline.Unix()) - if err = models.UpdateMilestone(m); err != nil { - ctx.ServerError("UpdateMilestone", err) - return - } - - ctx.Flash.Success(ctx.Tr("repo.milestones.edit_success", m.Name)) - ctx.Redirect(ctx.Repo.RepoLink + "/milestones") -} - -// ChangeMilestonStatus response for change a milestone's status -func ChangeMilestonStatus(ctx *context.Context) { - m, err := models.GetMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) - if err != nil { - if models.IsErrMilestoneNotExist(err) { - ctx.NotFound("", err) - } else { - ctx.ServerError("GetMilestoneByRepoID", err) - } - return - } - - switch ctx.Params(":action") { - case "open": - if m.IsClosed { - if err = models.ChangeMilestoneStatus(m, false); err != nil { - ctx.ServerError("ChangeMilestoneStatus", err) - return - } - } - ctx.Redirect(ctx.Repo.RepoLink + "/milestones?state=open") - case "close": - if !m.IsClosed { - m.ClosedDateUnix = util.TimeStampNow() - if err = models.ChangeMilestoneStatus(m, true); err != nil { - ctx.ServerError("ChangeMilestoneStatus", err) - return - } - } - ctx.Redirect(ctx.Repo.RepoLink + "/milestones?state=closed") - default: - ctx.Redirect(ctx.Repo.RepoLink + "/milestones") - } -} - -// DeleteMilestone delete a milestone -func DeleteMilestone(ctx *context.Context) { - if err := models.DeleteMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil { - ctx.Flash.Error("DeleteMilestoneByRepoID: " + err.Error()) - } else { - ctx.Flash.Success(ctx.Tr("repo.milestones.deletion_success")) - } - - ctx.JSON(200, map[string]interface{}{ - "redirect": ctx.Repo.RepoLink + "/milestones", - }) -} - // ChangeIssueReaction create a reaction for issue func ChangeIssueReaction(ctx *context.Context, form auth.ReactionForm) { issue := GetActionIssue(ctx) diff --git a/routers/repo/milestone.go b/routers/repo/milestone.go new file mode 100644 index 0000000000..eb2141e995 --- /dev/null +++ b/routers/repo/milestone.go @@ -0,0 +1,262 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package repo + +import ( + "time" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/markup/markdown" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" + "github.com/Unknwon/paginater" +) + +const ( + tplMilestone base.TplName = "repo/issue/milestones" + tplMilestoneNew base.TplName = "repo/issue/milestone_new" + tplMilestoneEdit base.TplName = "repo/issue/milestone_edit" + tplMilestoneIssues base.TplName = "repo/issue/milestone_issues" +) + +// Milestones render milestones page +func Milestones(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("repo.milestones") + ctx.Data["PageIsIssueList"] = true + ctx.Data["PageIsMilestones"] = true + + isShowClosed := ctx.Query("state") == "closed" + openCount, closedCount, err := models.MilestoneStats(ctx.Repo.Repository.ID) + if err != nil { + ctx.ServerError("MilestoneStats", err) + return + } + ctx.Data["OpenCount"] = openCount + ctx.Data["ClosedCount"] = closedCount + + sortType := ctx.Query("sort") + page := ctx.QueryInt("page") + if page <= 1 { + page = 1 + } + + var total int + if !isShowClosed { + total = int(openCount) + } else { + total = int(closedCount) + } + ctx.Data["Page"] = paginater.New(total, setting.UI.IssuePagingNum, page, 5) + + miles, err := models.GetMilestones(ctx.Repo.Repository.ID, page, isShowClosed, sortType) + if err != nil { + ctx.ServerError("GetMilestones", err) + return + } + if ctx.Repo.Repository.IsTimetrackerEnabled() { + if miles.LoadTotalTrackedTimes(); err != nil { + ctx.ServerError("LoadTotalTrackedTimes", err) + return + } + } + for _, m := range miles { + m.RenderedContent = string(markdown.Render([]byte(m.Content), ctx.Repo.RepoLink, ctx.Repo.Repository.ComposeMetas())) + } + ctx.Data["Milestones"] = miles + + if isShowClosed { + ctx.Data["State"] = "closed" + } else { + ctx.Data["State"] = "open" + } + + ctx.Data["SortType"] = sortType + ctx.Data["IsShowClosed"] = isShowClosed + ctx.HTML(200, tplMilestone) +} + +// NewMilestone render creating milestone page +func NewMilestone(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("repo.milestones.new") + ctx.Data["PageIsIssueList"] = true + ctx.Data["PageIsMilestones"] = true + ctx.Data["RequireDatetimepicker"] = true + ctx.Data["DateLang"] = setting.DateLang(ctx.Locale.Language()) + ctx.HTML(200, tplMilestoneNew) +} + +// NewMilestonePost response for creating milestone +func NewMilestonePost(ctx *context.Context, form auth.CreateMilestoneForm) { + ctx.Data["Title"] = ctx.Tr("repo.milestones.new") + ctx.Data["PageIsIssueList"] = true + ctx.Data["PageIsMilestones"] = true + ctx.Data["RequireDatetimepicker"] = true + ctx.Data["DateLang"] = setting.DateLang(ctx.Locale.Language()) + + if ctx.HasError() { + ctx.HTML(200, tplMilestoneNew) + return + } + + if len(form.Deadline) == 0 { + form.Deadline = "9999-12-31" + } + deadline, err := time.ParseInLocation("2006-01-02", form.Deadline, time.Local) + if err != nil { + ctx.Data["Err_Deadline"] = true + ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), tplMilestoneNew, &form) + return + } + + if err = models.NewMilestone(&models.Milestone{ + RepoID: ctx.Repo.Repository.ID, + Name: form.Title, + Content: form.Content, + DeadlineUnix: util.TimeStamp(deadline.Unix()), + }); err != nil { + ctx.ServerError("NewMilestone", err) + return + } + + ctx.Flash.Success(ctx.Tr("repo.milestones.create_success", form.Title)) + ctx.Redirect(ctx.Repo.RepoLink + "/milestones") +} + +// EditMilestone render edting milestone page +func EditMilestone(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("repo.milestones.edit") + ctx.Data["PageIsMilestones"] = true + ctx.Data["PageIsEditMilestone"] = true + ctx.Data["RequireDatetimepicker"] = true + ctx.Data["DateLang"] = setting.DateLang(ctx.Locale.Language()) + + m, err := models.GetMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) + if err != nil { + if models.IsErrMilestoneNotExist(err) { + ctx.NotFound("", nil) + } else { + ctx.ServerError("GetMilestoneByRepoID", err) + } + return + } + ctx.Data["title"] = m.Name + ctx.Data["content"] = m.Content + if len(m.DeadlineString) > 0 { + ctx.Data["deadline"] = m.DeadlineString + } + ctx.HTML(200, tplMilestoneNew) +} + +// EditMilestonePost response for edting milestone +func EditMilestonePost(ctx *context.Context, form auth.CreateMilestoneForm) { + ctx.Data["Title"] = ctx.Tr("repo.milestones.edit") + ctx.Data["PageIsMilestones"] = true + ctx.Data["PageIsEditMilestone"] = true + ctx.Data["RequireDatetimepicker"] = true + ctx.Data["DateLang"] = setting.DateLang(ctx.Locale.Language()) + + if ctx.HasError() { + ctx.HTML(200, tplMilestoneNew) + return + } + + if len(form.Deadline) == 0 { + form.Deadline = "9999-12-31" + } + deadline, err := time.ParseInLocation("2006-01-02", form.Deadline, time.Local) + if err != nil { + ctx.Data["Err_Deadline"] = true + ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), tplMilestoneNew, &form) + return + } + + m, err := models.GetMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) + if err != nil { + if models.IsErrMilestoneNotExist(err) { + ctx.NotFound("", nil) + } else { + ctx.ServerError("GetMilestoneByRepoID", err) + } + return + } + m.Name = form.Title + m.Content = form.Content + m.DeadlineUnix = util.TimeStamp(deadline.Unix()) + if err = models.UpdateMilestone(m); err != nil { + ctx.ServerError("UpdateMilestone", err) + return + } + + ctx.Flash.Success(ctx.Tr("repo.milestones.edit_success", m.Name)) + ctx.Redirect(ctx.Repo.RepoLink + "/milestones") +} + +// ChangeMilestonStatus response for change a milestone's status +func ChangeMilestonStatus(ctx *context.Context) { + m, err := models.GetMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) + if err != nil { + if models.IsErrMilestoneNotExist(err) { + ctx.NotFound("", err) + } else { + ctx.ServerError("GetMilestoneByRepoID", err) + } + return + } + + switch ctx.Params(":action") { + case "open": + if m.IsClosed { + if err = models.ChangeMilestoneStatus(m, false); err != nil { + ctx.ServerError("ChangeMilestoneStatus", err) + return + } + } + ctx.Redirect(ctx.Repo.RepoLink + "/milestones?state=open") + case "close": + if !m.IsClosed { + m.ClosedDateUnix = util.TimeStampNow() + if err = models.ChangeMilestoneStatus(m, true); err != nil { + ctx.ServerError("ChangeMilestoneStatus", err) + return + } + } + ctx.Redirect(ctx.Repo.RepoLink + "/milestones?state=closed") + default: + ctx.Redirect(ctx.Repo.RepoLink + "/milestones") + } +} + +// DeleteMilestone delete a milestone +func DeleteMilestone(ctx *context.Context) { + if err := models.DeleteMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil { + ctx.Flash.Error("DeleteMilestoneByRepoID: " + err.Error()) + } else { + ctx.Flash.Success(ctx.Tr("repo.milestones.deletion_success")) + } + + ctx.JSON(200, map[string]interface{}{ + "redirect": ctx.Repo.RepoLink + "/milestones", + }) +} + +// MilestoneIssuesAndPulls lists all the issues and pull requests of the milestone +func MilestoneIssuesAndPulls(ctx *context.Context) { + milestoneID := ctx.ParamsInt64(":id") + milestone, err := models.GetMilestoneByID(milestoneID) + if err != nil { + ctx.ServerError("GetMilestoneByID", err) + return + } + + ctx.Data["Title"] = milestone.Name + ctx.Data["Milestone"] = milestone + + issues(ctx, milestoneID, util.OptionalBoolNone) + + ctx.HTML(200, tplMilestoneIssues) +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index eb5841f593..5d9a6b31f0 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -578,7 +578,9 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/:id/:action", repo.ChangeMilestonStatus) m.Post("/delete", repo.DeleteMilestone) }, reqRepoIssuesOrPullsWriter, context.RepoRef()) - + m.Group("/milestone", func() { + m.Get("/:id", repo.MilestoneIssuesAndPulls) + }, reqRepoIssuesOrPullsWriter, context.RepoRef()) m.Combo("/compare/*", reqRepoCodeReader, reqRepoPullsReader, repo.MustAllowPulls, repo.SetEditorconfigIfExists). Get(repo.SetDiffViewStyle, repo.CompareAndPullRequest). Post(bindIgnErr(auth.CreateIssueForm{}), repo.CompareAndPullRequestPost) diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl new file mode 100644 index 0000000000..e89071500a --- /dev/null +++ b/templates/repo/issue/milestone_issues.tmpl @@ -0,0 +1,233 @@ +{{template "base/head" .}} +
+ {{template "repo/header" .}} +
+
+
+

{{.Milestone.Name}}

+
+
+ +
+
+ {{.i18n.Tr "repo.milestones.edit"}} + {{.i18n.Tr "repo.issues.new"}} +
+
+
+
+ {{ $closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.Lang }} + {{if .IsClosed}} + {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{else}} + + {{if .Milestone.DeadlineString}} + {{.Milestone.DeadlineString}} + {{else}} + {{$.i18n.Tr "repo.milestones.no_due_date"}} + {{end}} + {{end}} +   + {{.i18n.Tr "repo.milestones.completeness" .Milestone.Completeness}} +
+
+
+ +
+
+
+
{{.i18n.Tr "repo.issues.action_open"}}
+
{{.i18n.Tr "repo.issues.action_close"}}
+
+
+ + {{/* Ten wide does not cope well and makes the columns stack. + This seems to be related to jQuery's hide/show: in fact, switching + issue-actions and issue-filters and having this ten wide will show + this one correctly, but not the other one. */}} +
+
+ +
+ + {{.i18n.Tr "repo.issues.action_label"}} + + +
+ {{range .Labels}} +
+ {{.Name}} +
+ {{end}} +
+
+ + +
+ + {{.i18n.Tr "repo.issues.action_assignee"}} + + +
+
+ {{.i18n.Tr "repo.issues.action_assignee_no_select"}} +
+ {{range .Assignees}} +
+ {{.Name}} +
+ {{end}} +
+
+
+
+
+ +
+ {{range .Issues}} + {{ $timeStr:= TimeSinceUnix .CreatedUnix $.Lang }} +
  • +
    + +
    +
    #{{.Index}}
    + {{.Title}} + + {{if .Ref}} + {{.Ref}} + {{end}} + {{range .Labels}} + {{.Name}} + {{end}} + + {{if .NumComments}} + {{.NumComments}} + {{end}} + + {{if .TotalTrackedTime}} + {{.TotalTrackedTime | Sec2Time}} + {{end}} + +

    + {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}} + {{$tasks := .GetTasks}} + {{if gt $tasks 0}} + {{$tasksDone := .GetTasksDone}} + + {{$tasksDone}} / {{$tasks}} + + {{end}} + {{if ne .DeadlineUnix 0}} + + {{.DeadlineUnix.FormatShort}} + {{end}} + {{range .Assignees}} + + + + {{end}} +

    +
    • + {{end}} + + {{with .Page}} + {{if gt .TotalPages 1}} +
    + +
    + {{end}} + {{end}} +
    +
    +
    +{{template "base/footer" .}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 7b98c0cf56..36cbe5a057 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -43,7 +43,7 @@
    {{range .Milestones}}
  • - {{.Name}} + {{.Name}}