diff options
Diffstat (limited to 'routers/repo/issue.go')
| -rw-r--r-- | routers/repo/issue.go | 388 |
1 files changed, 210 insertions, 178 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 9d59d19a..9181d5bd 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -27,9 +27,9 @@ import ( ) const ( - ISSUES base.TplName = "repo/issue/list" - ISSUE_CREATE base.TplName = "repo/issue/create" - ISSUE_VIEW base.TplName = "repo/issue/view" + ISSUES base.TplName = "repo/issue/list" + ISSUE_NEW base.TplName = "repo/issue/new" + ISSUE_VIEW base.TplName = "repo/issue/view" LABELS base.TplName = "repo/issue/labels" @@ -44,7 +44,7 @@ var ( ) func RetrieveLabels(ctx *middleware.Context) { - labels, err := models.GetLabels(ctx.Repo.Repository.Id) + labels, err := models.GetLabelsByRepoID(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "RetrieveLabels.GetLabels: %v", err) return @@ -95,7 +95,7 @@ func Issues(ctx *middleware.Context) { selectLabels := ctx.Query("labels") milestoneID := ctx.QueryInt64("milestone") isShowClosed := ctx.Query("state") == "closed" - issueStats := models.GetIssueStats(repo.Id, uid, com.StrTo(selectLabels).MustInt64(), milestoneID, isShowClosed, filterMode) + issueStats := models.GetIssueStats(repo.ID, uid, com.StrTo(selectLabels).MustInt64(), milestoneID, isShowClosed, filterMode) page := ctx.QueryInt("page") if page <= 1 { @@ -111,17 +111,17 @@ func Issues(ctx *middleware.Context) { ctx.Data["Page"] = paginater.New(total, setting.IssuePagingNum, page, 5) // Get issues. - issues, err := models.Issues(uid, assigneeID, repo.Id, posterID, milestoneID, + issues, err := models.Issues(uid, assigneeID, repo.ID, posterID, milestoneID, page, isShowClosed, filterMode == models.FM_MENTION, selectLabels, ctx.Query("sortType")) if err != nil { - ctx.Handle(500, "GetIssues: %v", err) + ctx.Handle(500, "Issues: %v", err) return } - // Get issue-user pairs. - pairs, err := models.GetIssueUserPairs(repo.Id, posterID, isShowClosed) + // Get issue-user relations. + pairs, err := models.GetIssueUsers(repo.ID, posterID, isShowClosed) if err != nil { - ctx.Handle(500, "GetIssueUserPairs: %v", err) + ctx.Handle(500, "GetIssueUsers: %v", err) return } @@ -153,7 +153,7 @@ func Issues(ctx *middleware.Context) { ctx.Data["Issues"] = issues // Get milestones. - miles, err := models.GetAllRepoMilestones(repo.Id) + miles, err := models.GetAllRepoMilestones(repo.ID) if err != nil { ctx.Handle(500, "GetAllRepoMilestones: %v", err) return @@ -174,167 +174,194 @@ func Issues(ctx *middleware.Context) { ctx.HTML(200, ISSUES) } -func CreateIssue(ctx *middleware.Context) { - ctx.Data["Title"] = "Create issue" - ctx.Data["IsRepoToolbarIssues"] = true - ctx.Data["IsRepoToolbarIssuesList"] = false - ctx.Data["AttachmentsEnabled"] = setting.AttachmentEnabled +func NewIssue(ctx *middleware.Context) { + ctx.Data["Title"] = ctx.Tr("repo.issues.new") + ctx.Data["PageIsIssueList"] = true + ctx.Data["IsAttachmentEnabled"] = setting.AttachmentEnabled + ctx.Data["AttachmentAllowedTypes"] = setting.AttachmentAllowedTypes + + if ctx.User.IsAdmin { + var ( + repo = ctx.Repo.Repository + err error + ) + ctx.Data["Labels"], err = models.GetLabelsByRepoID(repo.ID) + if err != nil { + ctx.Handle(500, "GetLabelsByRepoID: %v", err) + return + } - var ( - repo = ctx.Repo.Repository - err error - ) - // Get all milestones. - ctx.Data["OpenMilestones"], err = models.GetMilestones(repo.Id, -1, false) - if err != nil { - ctx.Handle(500, "GetMilestones.1: %v", err) - return - } - ctx.Data["ClosedMilestones"], err = models.GetMilestones(repo.Id, -1, true) - if err != nil { - ctx.Handle(500, "GetMilestones.2: %v", err) - return - } + ctx.Data["OpenMilestones"], err = models.GetMilestones(repo.ID, -1, false) + if err != nil { + ctx.Handle(500, "GetMilestones: %v", err) + return + } + ctx.Data["ClosedMilestones"], err = models.GetMilestones(repo.ID, -1, true) + if err != nil { + ctx.Handle(500, "GetMilestones: %v", err) + return + } - us, err := repo.GetCollaborators() - if err != nil { - ctx.Handle(500, "GetCollaborators", err) - return + ctx.Data["Assignees"], err = repo.GetAssignees() + if err != nil { + ctx.Handle(500, "GetAssignees: %v", err) + return + } } - ctx.Data["AllowedTypes"] = setting.AttachmentAllowedTypes - ctx.Data["Collaborators"] = us - - ctx.HTML(200, ISSUE_CREATE) + ctx.HTML(200, ISSUE_NEW) } -func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { - send := func(status int, data interface{}, err error) { - if err != nil { - log.Error(4, "issue.CreateIssuePost(?): %s", err) +func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { + ctx.Data["Title"] = ctx.Tr("repo.issues.new") + ctx.Data["PageIsIssueList"] = true + ctx.Data["IsAttachmentEnabled"] = setting.AttachmentEnabled + ctx.Data["AttachmentAllowedTypes"] = setting.AttachmentAllowedTypes - ctx.JSON(status, map[string]interface{}{ - "ok": false, - "status": status, - "error": err.Error(), - }) - } else { - ctx.JSON(status, map[string]interface{}{ - "ok": true, - "status": status, - "data": data, - }) + var ( + repo = ctx.Repo.Repository + labelIDs []int64 + milestoneID int64 + assigneeID int64 + ) + if ctx.User.IsAdmin { + // Check labels. + labelIDs = base.StringsToInt64s(strings.Split(form.LabelIDs, ",")) + labelIDMark := base.Int64sToMap(labelIDs) + labels, err := models.GetLabelsByRepoID(repo.ID) + if err != nil { + ctx.Handle(500, "GetLabelsByRepoID: %v", err) + return } - } + hasSelected := false + for i := range labels { + if labelIDMark[labels[i].ID] { + labels[i].IsChecked = true + hasSelected = true + } + } + ctx.Data["HasSelectedLabel"] = hasSelected + ctx.Data["label_ids"] = form.LabelIDs + ctx.Data["Labels"] = labels - var err error - // Get all milestones. - _, err = models.GetMilestones(ctx.Repo.Repository.Id, -1, false) - if err != nil { - send(500, nil, err) - return - } - _, err = models.GetMilestones(ctx.Repo.Repository.Id, -1, true) - if err != nil { - send(500, nil, err) - return - } + // Check milestone. + milestoneID = form.MilestoneID + ctx.Data["OpenMilestones"], err = models.GetMilestones(repo.ID, -1, false) + if err != nil { + ctx.Handle(500, "GetMilestones: %v", err) + return + } + ctx.Data["ClosedMilestones"], err = models.GetMilestones(repo.ID, -1, true) + if err != nil { + ctx.Handle(500, "GetMilestones: %v", err) + return + } + ctx.Data["Milestone"], err = repo.GetMilestoneByID(milestoneID) + if err != nil { + ctx.Handle(500, "GetMilestoneByID: %v", err) + return + } + ctx.Data["milestone_id"] = milestoneID - _, err = ctx.Repo.Repository.GetCollaborators() - if err != nil { - send(500, nil, err) - return + // Check assignee. + assigneeID = form.AssigneeID + ctx.Data["Assignees"], err = repo.GetAssignees() + if err != nil { + ctx.Handle(500, "GetAssignees: %v", err) + return + } + ctx.Data["Assignee"], err = repo.GetAssigneeByID(assigneeID) + if err != nil { + ctx.Handle(500, "GetAssigneeByID: %v", err) + return + } + ctx.Data["assignee_id"] = assigneeID } if ctx.HasError() { - send(400, nil, errors.New(ctx.Flash.ErrorMsg)) + ctx.HTML(200, ISSUE_NEW) return } - // Only collaborators can assign. - if !ctx.Repo.IsOwner() { - form.AssigneeId = 0 - } issue := &models.Issue{ - RepoID: ctx.Repo.Repository.Id, - Index: int64(ctx.Repo.Repository.NumIssues) + 1, - Name: form.IssueName, + RepoID: ctx.Repo.Repository.ID, + Index: int64(repo.NumIssues) + 1, + Name: form.Title, PosterID: ctx.User.Id, - MilestoneID: form.MilestoneId, - AssigneeID: form.AssigneeId, - LabelIds: form.Labels, + MilestoneID: milestoneID, + AssigneeID: assigneeID, Content: form.Content, } - if err := models.NewIssue(issue); err != nil { - send(500, nil, err) - return - } else if err := models.NewIssueUserPairs(ctx.Repo.Repository, issue.ID, ctx.Repo.Owner.Id, - ctx.User.Id, form.AssigneeId); err != nil { - send(500, nil, err) + if err := models.NewIssue(repo, issue, labelIDs); err != nil { + ctx.Handle(500, "NewIssue", err) return } - if setting.AttachmentEnabled { - uploadFiles(ctx, issue.ID, 0) - } - - // Update mentions. - ms := base.MentionPattern.FindAllString(issue.Content, -1) - if len(ms) > 0 { - for i := range ms { - ms[i] = ms[i][1:] - } - - if err := models.UpdateMentions(ms, issue.ID); err != nil { - send(500, nil, err) - return - } - } - - act := &models.Action{ - ActUserID: ctx.User.Id, - ActUserName: ctx.User.Name, - ActEmail: ctx.User.Email, - OpType: models.CREATE_ISSUE, - Content: fmt.Sprintf("%d|%s", issue.Index, issue.Name), - RepoID: ctx.Repo.Repository.Id, - RepoUserName: ctx.Repo.Owner.Name, - RepoName: ctx.Repo.Repository.Name, - RefName: ctx.Repo.BranchName, - IsPrivate: ctx.Repo.Repository.IsPrivate, - } - // Notify watchers. - if err := models.NotifyWatchers(act); err != nil { - send(500, nil, err) - return - } - - // Mail watchers and mentions. - if setting.Service.EnableNotifyMail { - tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue) - if err != nil { - send(500, nil, err) - return - } - - tos = append(tos, ctx.User.LowerName) - newTos := make([]string, 0, len(ms)) - for _, m := range ms { - if com.IsSliceContainsStr(tos, m) { - continue - } - - newTos = append(newTos, m) - } - if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner, - ctx.Repo.Repository, issue, models.GetUserEmailsByNames(newTos)); err != nil { - send(500, nil, err) - return - } - } - log.Trace("%d Issue created: %d", ctx.Repo.Repository.Id, issue.ID) + ctx.Redirect(ctx.Repo.RepoLink + "/issues/" + com.ToStr(issue.Index)) +} - send(200, fmt.Sprintf("%s/%s/%s/issues/%d", setting.AppSubUrl, ctx.Params(":username"), ctx.Params(":reponame"), issue.Index), nil) +func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { + // if setting.AttachmentEnabled { + // uploadFiles(ctx, issue.ID, 0) + // } + + // // Update mentions. + // ms := base.MentionPattern.FindAllString(issue.Content, -1) + // if len(ms) > 0 { + // for i := range ms { + // ms[i] = ms[i][1:] + // } + + // if err := models.UpdateMentions(ms, issue.ID); err != nil { + // send(500, nil, err) + // return + // } + // } + + // act := &models.Action{ + // ActUserID: ctx.User.Id, + // ActUserName: ctx.User.Name, + // ActEmail: ctx.User.Email, + // OpType: models.CREATE_ISSUE, + // Content: fmt.Sprintf("%d|%s", issue.Index, issue.Name), + // RepoID: ctx.Repo.Repository.ID, + // RepoUserName: ctx.Repo.Owner.Name, + // RepoName: ctx.Repo.Repository.Name, + // RefName: ctx.Repo.BranchName, + // IsPrivate: ctx.Repo.Repository.IsPrivate, + // } + // // Notify watchers. + // if err := models.NotifyWatchers(act); err != nil { + // send(500, nil, err) + // return + // } + + // // Mail watchers and mentions. + // if setting.Service.EnableNotifyMail { + // tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue) + // if err != nil { + // send(500, nil, err) + // return + // } + + // tos = append(tos, ctx.User.LowerName) + // newTos := make([]string, 0, len(ms)) + // for _, m := range ms { + // if com.IsSliceContainsStr(tos, m) { + // continue + // } + + // newTos = append(newTos, m) + // } + // if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner, + // ctx.Repo.Repository, issue, models.GetUserEmailsByNames(newTos)); err != nil { + // send(500, nil, err) + // return + // } + // } + // log.Trace("%d Issue created: %d", ctx.Repo.Repository.ID, issue.ID) + + // send(200, fmt.Sprintf("%s/%s/%s/issues/%d", setting.AppSubUrl, ctx.Params(":username"), ctx.Params(":reponame"), issue.Index), nil) } func checkLabels(labels, allLabels []*models.Label) { @@ -357,7 +384,7 @@ func ViewIssue(ctx *middleware.Context) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, idx) if err != nil { if err == models.ErrIssueNotExist { ctx.Handle(404, "GetIssueByIndex", err) @@ -372,7 +399,7 @@ func ViewIssue(ctx *middleware.Context) { ctx.Handle(500, "GetLabels", err) return } - labels, err := models.GetLabels(ctx.Repo.Repository.Id) + labels, err := models.GetLabelsByRepoID(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "GetLabels.2", err) return @@ -394,12 +421,12 @@ func ViewIssue(ctx *middleware.Context) { } // Get all milestones. - ctx.Data["OpenMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, -1, false) + ctx.Data["OpenMilestones"], err = models.GetMilestones(ctx.Repo.Repository.ID, -1, false) if err != nil { ctx.Handle(500, "GetMilestones.1: %v", err) return } - ctx.Data["ClosedMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, -1, true) + ctx.Data["ClosedMilestones"], err = models.GetMilestones(ctx.Repo.Repository.ID, -1, true) if err != nil { ctx.Handle(500, "GetMilestones.2: %v", err) return @@ -439,7 +466,7 @@ func ViewIssue(ctx *middleware.Context) { // Get posters. for i := range comments { - u, err := models.GetUserById(comments[i].PosterId) + u, err := models.GetUserByID(comments[i].PosterId) if err != nil { ctx.Handle(500, "GetUserById.2: %v", err) return @@ -469,7 +496,7 @@ func UpdateIssue(ctx *middleware.Context, form auth.CreateIssueForm) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, idx) if err != nil { if err == models.ErrIssueNotExist { ctx.Handle(404, "issue.UpdateIssue", err) @@ -484,7 +511,7 @@ func UpdateIssue(ctx *middleware.Context, form auth.CreateIssueForm) { return } - issue.Name = form.IssueName + issue.Name = form.Title //issue.MilestoneId = form.MilestoneId //issue.AssigneeId = form.AssigneeId //issue.LabelIds = form.Labels @@ -517,7 +544,7 @@ func UpdateIssueLabel(ctx *middleware.Context) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, idx) if err != nil { if err == models.ErrIssueNotExist { ctx.Handle(404, "issue.UpdateIssueLabel(GetIssueByIndex)", err) @@ -529,10 +556,10 @@ func UpdateIssueLabel(ctx *middleware.Context) { isAttach := ctx.Query("action") == "attach" labelStrId := ctx.Query("id") - labelId := com.StrTo(labelStrId).MustInt64() - label, err := models.GetLabelById(labelId) + labelID := com.StrTo(labelStrId).MustInt64() + label, err := models.GetLabelByID(labelID) if err != nil { - if err == models.ErrLabelNotExist { + if models.IsErrLabelNotExist(err) { ctx.Handle(404, "issue.UpdateIssueLabel(GetLabelById)", err) } else { ctx.Handle(500, "issue.UpdateIssueLabel(GetLabelById)", err) @@ -540,16 +567,21 @@ func UpdateIssueLabel(ctx *middleware.Context) { return } - isHad := strings.Contains(issue.LabelIds, "$"+labelStrId+"|") isNeedUpdate := false if isAttach { - if !isHad { - issue.LabelIds += "$" + labelStrId + "|" + if !issue.HasLabel(labelID) { + if err = issue.AddLabel(labelID); err != nil { + ctx.Handle(500, "AddLabel", err) + return + } isNeedUpdate = true } } else { - if isHad { - issue.LabelIds = strings.Replace(issue.LabelIds, "$"+labelStrId+"|", "", -1) + if issue.HasLabel(labelID) { + if err = issue.RemoveLabel(labelID); err != nil { + ctx.Handle(500, "RemoveLabel", err) + return + } isNeedUpdate = true } } @@ -615,7 +647,7 @@ func UpdateIssueMilestone(ctx *middleware.Context) { // Not check for invalid milestone id and give responsibility to owners. issue.MilestoneID = mid - if err = models.ChangeMilestoneAssign(oldMid, mid, issue); err != nil { + if err = models.ChangeMilestoneAssign(oldMid, issue); err != nil { ctx.Handle(500, "issue.UpdateIssueMilestone(ChangeMilestoneAssign)", err) return } else if err = models.UpdateIssue(issue); err != nil { @@ -653,7 +685,7 @@ func UpdateAssignee(ctx *middleware.Context) { aid := com.StrTo(ctx.Query("assigneeid")).MustInt64() // Not check for invalid assignee id and give responsibility to owners. issue.AssigneeID = aid - if err = models.UpdateIssueUserPairByAssignee(aid, issue.ID); err != nil { + if err = models.UpdateIssueUserByAssignee(issue.ID, aid); err != nil { ctx.Handle(500, "UpdateIssueUserPairByAssignee: %v", err) return } else if err = models.UpdateIssue(issue); err != nil { @@ -762,7 +794,7 @@ func Comment(ctx *middleware.Context) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, index) if err != nil { if err == models.ErrIssueNotExist { send(404, nil, err) @@ -820,7 +852,7 @@ func Comment(ctx *middleware.Context) { cmtType = models.COMMENT_TYPE_REOPEN } - if _, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.ID, 0, 0, cmtType, "", nil); err != nil { + if _, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.ID, issue.ID, 0, 0, cmtType, "", nil); err != nil { send(200, nil, err) return } @@ -836,7 +868,7 @@ func Comment(ctx *middleware.Context) { if len(content) > 0 || len(ctx.Req.MultipartForm.File["attachments"]) > 0 { switch ctx.Params(":action") { case "new": - if comment, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.ID, 0, 0, models.COMMENT_TYPE_COMMENT, content, nil); err != nil { + if comment, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.ID, issue.ID, 0, 0, models.COMMENT_TYPE_COMMENT, content, nil); err != nil { send(500, nil, err) return } @@ -872,7 +904,7 @@ func Comment(ctx *middleware.Context) { ActEmail: ctx.User.Email, OpType: models.COMMENT_ISSUE, Content: fmt.Sprintf("%d|%s", issue.Index, strings.Split(content, "\n")[0]), - RepoID: ctx.Repo.Repository.Id, + RepoID: ctx.Repo.Repository.ID, RepoUserName: ctx.Repo.Owner.LowerName, RepoName: ctx.Repo.Repository.LowerName, IsPrivate: ctx.Repo.Repository.IsPrivate, @@ -927,7 +959,7 @@ func NewLabel(ctx *middleware.Context, form auth.CreateLabelForm) { } l := &models.Label{ - RepoId: ctx.Repo.Repository.Id, + RepoID: ctx.Repo.Repository.ID, Name: form.Title, Color: form.Color, } @@ -939,10 +971,10 @@ func NewLabel(ctx *middleware.Context, form auth.CreateLabelForm) { } func UpdateLabel(ctx *middleware.Context, form auth.CreateLabelForm) { - l, err := models.GetLabelById(form.ID) + l, err := models.GetLabelByID(form.ID) if err != nil { - switch err { - case models.ErrLabelNotExist: + switch { + case models.IsErrLabelNotExist(err): ctx.Error(404) default: ctx.Handle(500, "UpdateLabel", err) @@ -960,7 +992,7 @@ func UpdateLabel(ctx *middleware.Context, form auth.CreateLabelForm) { } func DeleteLabel(ctx *middleware.Context) { - if err := models.DeleteLabel(ctx.Repo.Repository.Id, ctx.QueryInt64("id")); err != nil { + if err := models.DeleteLabel(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil { ctx.Flash.Error("DeleteLabel: " + err.Error()) } else { ctx.Flash.Success(ctx.Tr("repo.issues.label_deletion_success")) @@ -977,7 +1009,7 @@ func Milestones(ctx *middleware.Context) { ctx.Data["PageIsMilestones"] = true isShowClosed := ctx.Query("state") == "closed" - openCount, closedCount := models.MilestoneStats(ctx.Repo.Repository.Id) + openCount, closedCount := models.MilestoneStats(ctx.Repo.Repository.ID) ctx.Data["OpenCount"] = openCount ctx.Data["ClosedCount"] = closedCount @@ -994,7 +1026,7 @@ func Milestones(ctx *middleware.Context) { } ctx.Data["Page"] = paginater.New(total, setting.IssuePagingNum, page, 5) - miles, err := models.GetMilestones(ctx.Repo.Repository.Id, page, isShowClosed) + miles, err := models.GetMilestones(ctx.Repo.Repository.ID, page, isShowClosed) if err != nil { ctx.Handle(500, "GetMilestones", err) return @@ -1043,7 +1075,7 @@ func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) { } if err = models.NewMilestone(&models.Milestone{ - RepoID: ctx.Repo.Repository.Id, + RepoID: ctx.Repo.Repository.ID, Name: form.Title, Content: form.Content, Deadline: deadline, |