* 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 paramstags/v1.7.0-dev
@@ -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 | |||
} | |||
@@ -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 | |||
@@ -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 |
@@ -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,19 +198,19 @@ func Issues(ctx *context.Context) { | |||
} | |||
ctx.Data["Issues"] = issues | |||
// Get milestones. | |||
ctx.Data["Milestones"], err = models.GetMilestonesByRepoID(repo.ID) | |||
// Get assignees. | |||
ctx.Data["Assignees"], err = repo.GetAssignees() | |||
if err != nil { | |||
ctx.ServerError("GetAllRepoMilestones", err) | |||
ctx.ServerError("GetAssignees", err) | |||
return | |||
} | |||
// Get assignees. | |||
ctx.Data["Assignees"], err = repo.GetAssignees() | |||
labels, err := models.GetLabelsByRepoID(repo.ID, "") | |||
if err != nil { | |||
ctx.ServerError("GetAssignees", err) | |||
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) |
@@ -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) | |||
} |
@@ -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) |
@@ -0,0 +1,233 @@ | |||
{{template "base/head" .}} | |||
<div class="repository"> | |||
{{template "repo/header" .}} | |||
<div class="ui container"> | |||
<div class="ui three column stackable grid"> | |||
<div class="column"> | |||
<h3>{{.Milestone.Name}}</h3> | |||
</div> | |||
<div class="column center aligned"> | |||
</div> | |||
<div class="column right aligned"> | |||
<a class="ui grey button" href="{{.RepoLink}}/milestones/{{.MilestoneID}}/edit">{{.i18n.Tr "repo.milestones.edit"}}</a> | |||
<a class="ui green button" href="{{.RepoLink}}/issues/new?milestone={{.MilestoneID}}">{{.i18n.Tr "repo.issues.new"}}</a> | |||
</div> | |||
</div> | |||
<div class="ui one column stackable grid"> | |||
<div class="column"> | |||
{{ $closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.Lang }} | |||
{{if .IsClosed}} | |||
<span class="octicon octicon-clock"></span> {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} | |||
{{else}} | |||
<span class="octicon octicon-calendar"></span> | |||
{{if .Milestone.DeadlineString}} | |||
<span {{if .IsOverdue}}class="overdue"{{end}}>{{.Milestone.DeadlineString}}</span> | |||
{{else}} | |||
{{$.i18n.Tr "repo.milestones.no_due_date"}} | |||
{{end}} | |||
{{end}} | |||
| |||
<b>{{.i18n.Tr "repo.milestones.completeness" .Milestone.Completeness}}</b> | |||
</div> | |||
</div> | |||
<div class="ui divider"></div> | |||
<div id="issue-filters" class="ui stackable grid"> | |||
<div class="six wide column"> | |||
<div class="ui tiny basic status buttons"> | |||
<a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&assignee={{.AssigneeID}}"> | |||
<i class="octicon octicon-issue-opened"></i> | |||
{{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} | |||
</a> | |||
<a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&assignee={{.AssigneeID}}"> | |||
<i class="octicon octicon-issue-closed"></i> | |||
{{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} | |||
</a> | |||
</div> | |||
</div> | |||
<div class="ten wide right aligned column"> | |||
<div class="ui secondary filter stackable menu"> | |||
<!-- Label --> | |||
<div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item" style="margin-left: auto"> | |||
<span class="text"> | |||
{{.i18n.Tr "repo.issues.filter_label"}} | |||
<i class="dropdown icon"></i> | |||
</span> | |||
<div class="menu"> | |||
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_label_no_select"}}</a> | |||
{{range .Labels}} | |||
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.ID}}&assignee={{$.AssigneeID}}"><span class="octicon {{if eq $.SelectLabels .ID}}octicon-check{{end}}"></span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name}}</a> | |||
{{end}} | |||
</div> | |||
</div> | |||
<!-- Assignee --> | |||
<div class="ui {{if not .Assignees}}disabled{{end}} dropdown jump item"> | |||
<span class="text"> | |||
{{.i18n.Tr "repo.issues.filter_assignee"}} | |||
<i class="dropdown icon"></i> | |||
</span> | |||
<div class="menu"> | |||
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}">{{.i18n.Tr "repo.issues.filter_assginee_no_select"}}</a> | |||
{{range .Assignees}} | |||
<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&assignee={{.ID}}"><img src="{{.RelAvatarLink}}"> {{.Name}}</a> | |||
{{end}} | |||
</div> | |||
</div> | |||
{{if .IsSigned}} | |||
<!-- Type --> | |||
<div class="ui dropdown type jump item"> | |||
<span class="text"> | |||
{{.i18n.Tr "repo.issues.filter_type"}} | |||
<i class="dropdown icon"></i> | |||
</span> | |||
<div class="menu"> | |||
<a class="{{if eq .ViewType "all"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=all&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.all_issues"}}</a> | |||
<a class="{{if eq .ViewType "assigned"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=assigned&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{.SignedUser.ID}}">{{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}}</a> | |||
<a class="{{if eq .ViewType "created_by"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=created_by&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.created_by_you"}}</a> | |||
<a class="{{if eq .ViewType "mentioned"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=mentioned&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.mentioning_you"}}</a> | |||
</div> | |||
</div> | |||
{{end}} | |||
<!-- Sort --> | |||
<div class="ui dropdown type jump item"> | |||
<span class="text"> | |||
{{.i18n.Tr "repo.issues.filter_sort"}} | |||
<i class="dropdown icon"></i> | |||
</span> | |||
<div class="menu"> | |||
<a class="{{if or (eq .SortType "latest") (not .SortType)}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=latest&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a> | |||
<a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=oldest&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a> | |||
<a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=recentupdate&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a> | |||
<a class="{{if eq .SortType "leastupdate"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=leastupdate&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a> | |||
<a class="{{if eq .SortType "mostcomment"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=mostcomment&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_sort.mostcomment"}}</a> | |||
<a class="{{if eq .SortType "leastcomment"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=leastcomment&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_sort.leastcomment"}}</a> | |||
</div> | |||
</div> | |||
</div> | |||
</div> | |||
</div> | |||
<div id="issue-actions" class="ui stackable grid"> | |||
<div class="six wide column"> | |||
<div class="ui basic status buttons"> | |||
<div class="ui green active basic button issue-action" data-action="open" data-url="{{$.RepoLink}}/issues/status">{{.i18n.Tr "repo.issues.action_open"}}</div> | |||
<div class="ui red active basic button issue-action" data-action="close" data-url="{{$.RepoLink}}/issues/status">{{.i18n.Tr "repo.issues.action_close"}}</div> | |||
</div> | |||
</div> | |||
{{/* 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. */}} | |||
<div class="nine wide right aligned right floated column"> | |||
<div class="ui secondary filter stackable menu"> | |||
<!-- Labels --> | |||
<div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item" style="margin-left: auto"> | |||
<span class="text"> | |||
{{.i18n.Tr "repo.issues.action_label"}} | |||
<i class="dropdown icon"></i> | |||
</span> | |||
<div class="menu"> | |||
{{range .Labels}} | |||
<div class="item issue-action" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels"> | |||
<span class="octicon {{if eq $.SelectLabels .ID}}octicon-check{{end}}"></span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name}} | |||
</div> | |||
{{end}} | |||
</div> | |||
</div> | |||
<!-- Assignees --> | |||
<div class="ui {{if not .Assignees}}disabled{{end}} dropdown jump item"> | |||
<span class="text"> | |||
{{.i18n.Tr "repo.issues.action_assignee"}} | |||
<i class="dropdown icon"></i> | |||
</span> | |||
<div class="menu"> | |||
<div class="item issue-action" data-element-id="0" data-url="{{$.Link}}/assignee"> | |||
{{.i18n.Tr "repo.issues.action_assignee_no_select"}} | |||
</div> | |||
{{range .Assignees}} | |||
<div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/assignee"> | |||
<img src="{{.RelAvatarLink}}"> {{.Name}} | |||
</div> | |||
{{end}} | |||
</div> | |||
</div> | |||
</div> | |||
</div> | |||
</div> | |||
<div class="issue list"> | |||
{{range .Issues}} | |||
{{ $timeStr:= TimeSinceUnix .CreatedUnix $.Lang }} | |||
<li class="item"> | |||
<div class="ui checkbox issue-checkbox"> | |||
<input type="checkbox" data-issue-id={{.ID}}></input> | |||
</div> | |||
<div class="ui {{if .IsRead}}black{{else}}green{{end}} label">#{{.Index}}</div> | |||
<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a> | |||
{{if .Ref}} | |||
<a class="ui label" href="{{$.RepoLink}}/src/branch/{{.Ref}}">{{.Ref}}</a> | |||
{{end}} | |||
{{range .Labels}} | |||
<a class="ui label" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description}}">{{.Name}}</a> | |||
{{end}} | |||
{{if .NumComments}} | |||
<span class="comment ui right"><i class="octicon octicon-comment"></i> {{.NumComments}}</span> | |||
{{end}} | |||
{{if .TotalTrackedTime}} | |||
<span class="comment ui right"><i class="octicon octicon-clock"></i> {{.TotalTrackedTime | Sec2Time}}</span> | |||
{{end}} | |||
<p class="desc"> | |||
{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}} | |||
{{$tasks := .GetTasks}} | |||
{{if gt $tasks 0}} | |||
{{$tasksDone := .GetTasksDone}} | |||
<span class="checklist"> | |||
<span class="octicon octicon-checklist"></span> {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span> | |||
</span> | |||
{{end}} | |||
{{if ne .DeadlineUnix 0}} | |||
<span class="octicon octicon-calendar"></span> | |||
<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span> | |||
{{end}} | |||
{{range .Assignees}} | |||
<a class="ui right assignee poping up" href="{{.HomeLink}}" data-content="{{.Name}}" data-variation="inverted" data-position="left center"> | |||
<img class="ui avatar image" src="{{.RelAvatarLink}}"> | |||
</a> | |||
{{end}} | |||
</p> | |||
</li> | |||
{{end}} | |||
{{with .Page}} | |||
{{if gt .TotalPages 1}} | |||
<div class="center page buttons"> | |||
<div class="ui borderless pagination menu"> | |||
<a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&assignee={{$.AssigneeID}}&page={{.Previous}}"{{end}}> | |||
<i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}} | |||
</a> | |||
{{range .Pages}} | |||
{{if eq .Num -1}} | |||
<a class="disabled item">...</a> | |||
{{else}} | |||
<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&assignee={{$.AssigneeID}}&page={{.Num}}"{{end}}>{{.Num}}</a> | |||
{{end}} | |||
{{end}} | |||
<a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&assignee={{$.AssigneeID}}&page={{.Next}}"{{end}}> | |||
{{$.i18n.Tr "repo.issues.next"}} <i class="icon right arrow"></i> | |||
</a> | |||
</div> | |||
</div> | |||
{{end}} | |||
{{end}} | |||
</div> | |||
</div> | |||
</div> | |||
{{template "base/footer" .}} |
@@ -43,7 +43,7 @@ | |||
<div class="milestone list"> | |||
{{range .Milestones}} | |||
<li class="item"> | |||
<i class="octicon octicon-milestone"></i> <a href="{{$.RepoLink}}/issues?state={{$.State}}&milestone={{.ID}}">{{.Name}}</a> | |||
<i class="octicon octicon-milestone"></i> <a href="{{$.RepoLink}}/milestone/{{.ID}}">{{.Name}}</a> | |||
<div class="ui right green progress" data-percent="{{.Completeness}}"> | |||
<div class="bar" {{if not .Completeness}}style="background-color: transparent"{{end}}> | |||
<div class="progress"></div> |