diff options
Diffstat (limited to 'routers/repo/issue.go')
| -rw-r--r-- | routers/repo/issue.go | 790 |
1 files changed, 337 insertions, 453 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 9d59d19a..c4903a92 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -7,8 +7,6 @@ package repo import ( "errors" "fmt" - "io" - "io/ioutil" "net/http" "net/url" "strings" @@ -27,9 +25,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 +42,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 +93,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 +109,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 +151,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,152 +172,169 @@ 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 renderAttachmentSettings(ctx *middleware.Context) { + ctx.Data["IsAttachmentEnabled"] = setting.AttachmentEnabled + ctx.Data["AttachmentAllowedTypes"] = setting.AttachmentAllowedTypes + ctx.Data["AttachmentMaxFiles"] = setting.AttachmentMaxFiles +} - 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 - } +func NewIssue(ctx *middleware.Context) { + ctx.Data["Title"] = ctx.Tr("repo.issues.new") + ctx.Data["PageIsIssueList"] = true + ctx.Data["RequireDropzone"] = true + renderAttachmentSettings(ctx) + + 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 + } - us, err := repo.GetCollaborators() - if err != nil { - ctx.Handle(500, "GetCollaborators", 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 + } - ctx.Data["AllowedTypes"] = setting.AttachmentAllowedTypes - ctx.Data["Collaborators"] = us + ctx.Data["Assignees"], err = repo.GetAssignees() + if err != nil { + ctx.Handle(500, "GetAssignees: %v", err) + return + } + } - 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["RequireDropzone"] = true + renderAttachmentSettings(ctx) - 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 + attachments []string + ) + 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 + + // Check milestone. + milestoneID = form.MilestoneID + if milestoneID > 0 { + 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 } - } - 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 assignee. + assigneeID = form.AssigneeID + if assigneeID > 0 { + 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 + } } - _, err = ctx.Repo.Repository.GetCollaborators() - if err != nil { - send(500, nil, err) - return + if setting.AttachmentEnabled { + attachments = form.Attachments } 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, + Poster: ctx.User, + 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, attachments); 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:] + mentions := base.MentionPattern.FindAllString(issue.Content, -1) + if len(mentions) > 0 { + for i := range mentions { + mentions[i] = mentions[i][1:] } - if err := models.UpdateMentions(ms, issue.ID); err != nil { - send(500, nil, err) + if err := models.UpdateMentions(mentions, issue.ID); err != nil { + ctx.Handle(500, "UpdateMentions", 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) + ctx.Handle(500, "SendIssueNotifyMail", err) return } tos = append(tos, ctx.User.LowerName) - newTos := make([]string, 0, len(ms)) - for _, m := range ms { + newTos := make([]string, 0, len(mentions)) + for _, m := range mentions { if com.IsSliceContainsStr(tos, m) { continue } @@ -328,137 +343,172 @@ func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { } if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue, models.GetUserEmailsByNames(newTos)); err != nil { - send(500, nil, err) + ctx.Handle(500, "SendIssueMentionMail", 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) + log.Trace("Issue created: %d/%d", ctx.Repo.Repository.ID, issue.ID) + ctx.Redirect(ctx.Repo.RepoLink + "/issues/" + com.ToStr(issue.Index)) } -func checkLabels(labels, allLabels []*models.Label) { - for _, l := range labels { - for _, l2 := range allLabels { - if l.ID == l2.ID { - l2.IsChecked = true - break - } - } +func UploadIssueAttachment(ctx *middleware.Context) { + if !setting.AttachmentEnabled { + ctx.Error(404, "attachment is not enabled") + return } -} - -func ViewIssue(ctx *middleware.Context) { - ctx.Data["AttachmentsEnabled"] = setting.AttachmentEnabled - idx := com.StrTo(ctx.Params(":index")).MustInt64() - if idx == 0 { - ctx.Handle(404, "issue.ViewIssue", nil) + allowedTypes := strings.Split(setting.AttachmentAllowedTypes, ",") + file, header, err := ctx.Req.FormFile("file") + if err != nil { + ctx.Error(500, fmt.Sprintf("FormFile: %v", err)) return } + defer file.Close() - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx) - if err != nil { - if err == models.ErrIssueNotExist { - ctx.Handle(404, "GetIssueByIndex", err) - } else { - ctx.Handle(500, "GetIssueByIndex", err) + buf := make([]byte, 1024) + n, _ := file.Read(buf) + if n > 0 { + buf = buf[:n] + } + fileType := http.DetectContentType(buf) + + allowed := false + for _, t := range allowedTypes { + t := strings.Trim(t, " ") + if t == "*/*" || t == fileType { + allowed = true + break } - return } - // Get labels. - if err = issue.GetLabels(); err != nil { - ctx.Handle(500, "GetLabels", err) + if !allowed { + ctx.Error(400, ErrFileTypeForbidden.Error()) return } - labels, err := models.GetLabels(ctx.Repo.Repository.Id) + + attach, err := models.NewAttachment(header.Filename, buf, file) if err != nil { - ctx.Handle(500, "GetLabels.2", err) + ctx.Error(500, fmt.Sprintf("NewAttachment: %v", err)) return } - checkLabels(issue.Labels, labels) - ctx.Data["Labels"] = labels - // Get assigned milestone. - if issue.MilestoneID > 0 { - ctx.Data["Milestone"], err = models.GetMilestoneByID(issue.MilestoneID) - if err != nil { - if models.IsErrMilestoneNotExist(err) { - log.Warn("GetMilestoneById: %v", err) - } else { - ctx.Handle(500, "GetMilestoneById", err) - return + log.Trace("New attachment uploaded: %s", attach.UUID) + ctx.JSON(200, map[string]string{ + "uuid": attach.UUID, + }) +} + +func checkLabels(labels, allLabels []*models.Label) { + for _, l := range labels { + for _, l2 := range allLabels { + if l.ID == l2.ID { + l2.IsChecked = true + break } } } +} - // Get all milestones. - ctx.Data["OpenMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, -1, false) +func ViewIssue(ctx *middleware.Context) { + ctx.Data["PageIsIssueList"] = true + ctx.Data["RequireDropzone"] = true + renderAttachmentSettings(ctx) + + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { - ctx.Handle(500, "GetMilestones.1: %v", err) + if models.IsErrIssueNotExist(err) { + ctx.Handle(404, "GetIssueByIndex", err) + } else { + ctx.Handle(500, "GetIssueByIndex", err) + } return } - ctx.Data["ClosedMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, -1, true) - if err != nil { - ctx.Handle(500, "GetMilestones.2: %v", err) + ctx.Data["Title"] = issue.Name + + if err = issue.GetPoster(); err != nil { + ctx.Handle(500, "GetPoster", err) return } + issue.RenderedContent = string(base.RenderMarkdown([]byte(issue.Content), ctx.Repo.RepoLink)) - // Get all collaborators. - ctx.Data["Collaborators"], err = ctx.Repo.Repository.GetCollaborators() - if err != nil { - ctx.Handle(500, "GetCollaborators", err) + // Metas. + if err = issue.GetLabels(); err != nil { + ctx.Handle(500, "GetLabels", err) return } if ctx.IsSigned { // Update issue-user. - if err = models.UpdateIssueUserPairByRead(ctx.User.Id, issue.ID); err != nil { - ctx.Handle(500, "UpdateIssueUserPairByRead: %v", err) + if err = issue.ReadBy(ctx.User.Id); err != nil { + ctx.Handle(500, "ReadBy", err) return } - } - // Get poster and Assignee. - if err = issue.GetPoster(); err != nil { - ctx.Handle(500, "GetPoster: %v", err) - return - } else if err = issue.GetAssignee(); err != nil { - ctx.Handle(500, "GetAssignee: %v", err) - return + if ctx.User.IsAdmin { + // labels, err := models.GetLabelsByRepoID(ctx.Repo.Repository.ID) + // if err != nil { + // ctx.Handle(500, "GetLabels.2", err) + // return + // } + // checkLabels(issue.Labels, labels) + // ctx.Data["Labels"] = labels + + // // Get all milestones. + // 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) + // if err != nil { + // ctx.Handle(500, "GetMilestones.2: %v", err) + // return + // } + + // // Get all collaborators. + // ctx.Data["Collaborators"], err = ctx.Repo.Repository.GetCollaborators() + // if err != nil { + // ctx.Handle(500, "GetCollaborators", err) + // return + // } + } } - issue.RenderedContent = string(base.RenderMarkdown([]byte(issue.Content), ctx.Repo.RepoLink)) - // Get comments. - comments, err := models.GetIssueComments(issue.ID) - if err != nil { - ctx.Handle(500, "GetIssueComments: %v", err) - return - } + var ( + repo = ctx.Repo.Repository + tag models.CommentTag + ok bool + marked = make(map[int64]models.CommentTag) + comment *models.Comment + ) + // Render comments. + for _, comment = range issue.Comments { + if comment.Type == models.COMMENT_TYPE_COMMENT { + comment.RenderedContent = string(base.RenderMarkdown([]byte(comment.Content), ctx.Repo.RepoLink)) + + // Check tag. + tag, ok = marked[comment.PosterID] + if ok { + comment.ShowTag = tag + continue + } - // Get posters. - for i := range comments { - u, err := models.GetUserById(comments[i].PosterId) - if err != nil { - ctx.Handle(500, "GetUserById.2: %v", err) - return - } - comments[i].Poster = u + if repo.IsOwnedBy(comment.PosterID) || + (repo.Owner.IsOrganization() && repo.Owner.IsOwnedBy(comment.PosterID)) { + comment.ShowTag = models.COMMENT_TAG_OWNER + } else if comment.Poster.IsAdminOfRepo(repo) { + comment.ShowTag = models.COMMENT_TAG_ADMIN + } else if comment.PosterID == issue.PosterID { + comment.ShowTag = models.COMMENT_TAG_POSTER + } - if comments[i].Type == models.COMMENT_TYPE_COMMENT { - comments[i].Content = string(base.RenderMarkdown([]byte(comments[i].Content), ctx.Repo.RepoLink)) + marked[comment.PosterID] = comment.ShowTag } } - ctx.Data["AllowedTypes"] = setting.AttachmentAllowedTypes - - ctx.Data["Title"] = issue.Name ctx.Data["Issue"] = issue - ctx.Data["Comments"] = comments - ctx.Data["IsIssueOwner"] = ctx.Repo.IsOwner() || (ctx.IsSigned && issue.PosterID == ctx.User.Id) - ctx.Data["IsRepoToolbarIssues"] = true - ctx.Data["IsRepoToolbarIssuesList"] = false + // ctx.Data["IsIssueOwner"] = ctx.Repo.IsOwner() || (ctx.IsSigned && issue.PosterID == ctx.User.Id) ctx.HTML(200, ISSUE_VIEW) } @@ -469,9 +519,9 @@ 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 { + if models.IsErrIssueNotExist(err) { ctx.Handle(404, "issue.UpdateIssue", err) } else { ctx.Handle(500, "issue.UpdateIssue(GetIssueByIndex)", err) @@ -484,7 +534,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,9 +567,9 @@ 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 { + if models.IsErrIssueNotExist(err) { ctx.Handle(404, "issue.UpdateIssueLabel(GetIssueByIndex)", err) } else { ctx.Handle(500, "issue.UpdateIssueLabel(GetIssueByIndex)", err) @@ -529,10 +579,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 +590,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 } } @@ -594,12 +649,12 @@ func UpdateIssueMilestone(ctx *middleware.Context) { return } - issue, err := models.GetIssueById(issueId) + issue, err := models.GetIssueByID(issueId) if err != nil { - if err == models.ErrIssueNotExist { - ctx.Handle(404, "issue.UpdateIssueMilestone(GetIssueById)", err) + if models.IsErrIssueNotExist(err) { + ctx.Handle(404, "issue.UpdateIssueMilestone(GetIssueByID)", err) } else { - ctx.Handle(500, "issue.UpdateIssueMilestone(GetIssueById)", err) + ctx.Handle(500, "issue.UpdateIssueMilestone(GetIssueByID)", err) } return } @@ -615,7 +670,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 { @@ -640,12 +695,12 @@ func UpdateAssignee(ctx *middleware.Context) { return } - issue, err := models.GetIssueById(issueId) + issue, err := models.GetIssueByID(issueId) if err != nil { - if err == models.ErrIssueNotExist { - ctx.Handle(404, "GetIssueById", err) + if models.IsErrIssueNotExist(err) { + ctx.Handle(404, "GetIssueByID", err) } else { - ctx.Handle(500, "GetIssueById", err) + ctx.Handle(500, "GetIssueByID", err) } return } @@ -653,7 +708,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 { @@ -666,234 +721,76 @@ func UpdateAssignee(ctx *middleware.Context) { }) } -func uploadFiles(ctx *middleware.Context, issueId, commentId int64) { - if !setting.AttachmentEnabled { +func NewComment(ctx *middleware.Context, form auth.CreateCommentForm) { + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + if err != nil { + if models.IsErrIssueNotExist(err) { + ctx.Handle(404, "GetIssueByIndex", err) + } else { + ctx.Handle(500, "GetIssueByIndex", err) + } return } - allowedTypes := strings.Split(setting.AttachmentAllowedTypes, "|") - attachments := ctx.Req.MultipartForm.File["attachments"] + var attachments []string + if setting.AttachmentEnabled { + attachments = form.Attachments + } - if len(attachments) > setting.AttachmentMaxFiles { - ctx.Handle(400, "issue.Comment", ErrTooManyFiles) + if ctx.HasError() { + ctx.Flash.Error(ctx.Data["ErrorMsg"].(string)) + ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index)) return } - for _, header := range attachments { - file, err := header.Open() - - if err != nil { - ctx.Handle(500, "issue.Comment(header.Open)", err) - return - } - - defer file.Close() - - buf := make([]byte, 1024) - n, _ := file.Read(buf) - if n > 0 { - buf = buf[:n] - } - fileType := http.DetectContentType(buf) - fmt.Println(fileType) - - allowed := false - - for _, t := range allowedTypes { - t := strings.Trim(t, " ") - - if t == "*/*" || t == fileType { - allowed = true - break - } - } - - if !allowed { - ctx.Handle(400, "issue.Comment", ErrFileTypeForbidden) - return - } - - out, err := ioutil.TempFile(setting.AttachmentPath, "attachment_") - - if err != nil { - ctx.Handle(500, "ioutil.TempFile", err) - return - } - - defer out.Close() - - out.Write(buf) - _, err = io.Copy(out, file) - if err != nil { - ctx.Handle(500, "io.Copy", err) - return - } - - _, err = models.CreateAttachment(issueId, commentId, header.Filename, out.Name()) - if err != nil { - ctx.Handle(500, "CreateAttachment", err) + // Check if issue owner/poster changes the status of issue. + if (ctx.Repo.IsOwner() || issue.IsPoster(ctx.User.Id)) && + (form.Status == "reopen" || form.Status == "close") { + issue.Repo = ctx.Repo.Repository + if err = issue.ChangeStatus(ctx.User, form.Status == "close"); err != nil { + ctx.Handle(500, "ChangeStatus", err) return } + log.Trace("%s Issue[%d] status changed: %v", ctx.Req.RequestURI, issue.ID, !issue.IsClosed) } -} - -func Comment(ctx *middleware.Context) { - send := func(status int, data interface{}, err error) { - if err != nil { - log.Error(4, "issue.Comment(?): %s", err) - 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, - }) - } - } - - index := com.StrTo(ctx.Query("issueIndex")).MustInt64() - if index == 0 { - ctx.Error(404) + // Fix #321: Allow empty comments, as long as we have attachments. + if len(form.Content) == 0 && len(attachments) == 0 { + ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index)) return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index) + comment, err := models.CreateIssueComment(ctx.User, ctx.Repo.Repository, issue, form.Content, attachments) if err != nil { - if err == models.ErrIssueNotExist { - send(404, nil, err) - } else { - send(200, nil, err) - } - + ctx.Handle(500, "CreateIssueComment", err) return } - // Check if issue owner changes the status of issue. - var newStatus string - if ctx.Repo.IsOwner() || issue.PosterID == ctx.User.Id { - newStatus = ctx.Query("change_status") - } - if len(newStatus) > 0 { - if (strings.Contains(newStatus, "Reopen") && issue.IsClosed) || - (strings.Contains(newStatus, "Close") && !issue.IsClosed) { - issue.IsClosed = !issue.IsClosed - if err = models.UpdateIssue(issue); err != nil { - send(500, nil, err) - return - } else if err = models.UpdateIssueUserPairsByStatus(issue.ID, issue.IsClosed); err != nil { - send(500, nil, err) - return - } - - if err = issue.GetLabels(); err != nil { - send(500, nil, err) - return - } - - for _, label := range issue.Labels { - if issue.IsClosed { - label.NumClosedIssues++ - } else { - label.NumClosedIssues-- - } - - if err = models.UpdateLabel(label); err != nil { - send(500, nil, err) - return - } - } - - // Change open/closed issue counter for the associated milestone - if issue.MilestoneID > 0 { - if err = models.ChangeMilestoneIssueStats(issue); err != nil { - send(500, nil, err) - } - } - - cmtType := models.COMMENT_TYPE_CLOSE - if !issue.IsClosed { - cmtType = models.COMMENT_TYPE_REOPEN - } - - if _, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.ID, 0, 0, cmtType, "", nil); err != nil { - send(200, nil, err) - return - } - log.Trace("%s Issue(%d) status changed: %v", ctx.Req.RequestURI, issue.ID, !issue.IsClosed) + // Update mentions. + mentions := base.MentionPattern.FindAllString(comment.Content, -1) + if len(mentions) > 0 { + for i := range mentions { + mentions[i] = mentions[i][1:] } - } - - var comment *models.Comment - var ms []string - content := ctx.Query("content") - // Fix #321. Allow empty comments, as long as we have attachments. - 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 { - send(500, nil, err) - return - } - - // 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 - } - } - - log.Trace("%s Comment created: %d", ctx.Req.RequestURI, issue.ID) - default: - ctx.Handle(404, "issue.Comment", err) + if err := models.UpdateMentions(mentions, issue.ID); err != nil { + ctx.Handle(500, "UpdateMentions", err) return } } - if comment != nil { - uploadFiles(ctx, issue.ID, comment.Id) - } - - // Notify watchers. - act := &models.Action{ - ActUserID: ctx.User.Id, - ActUserName: ctx.User.LowerName, - 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, - RepoUserName: ctx.Repo.Owner.LowerName, - RepoName: ctx.Repo.Repository.LowerName, - IsPrivate: ctx.Repo.Repository.IsPrivate, - } - if err = models.NotifyWatchers(act); err != nil { - send(500, nil, err) - return - } - // Mail watchers and mentions. if setting.Service.EnableNotifyMail { - issue.Content = content + issue.Content = form.Content tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue) if err != nil { - send(500, nil, err) + ctx.Handle(500, "SendIssueNotifyMail", err) return } tos = append(tos, ctx.User.LowerName) - newTos := make([]string, 0, len(ms)) - for _, m := range ms { + newTos := make([]string, 0, len(mentions)) + for _, m := range mentions { if com.IsSliceContainsStr(tos, m) { continue } @@ -902,17 +799,19 @@ func Comment(ctx *middleware.Context) { } if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue, models.GetUserEmailsByNames(newTos)); err != nil { - send(500, nil, err) + ctx.Handle(500, "SendIssueMentionMail", err) return } } - send(200, fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, index), nil) + log.Trace("Comment created: %d/%d/%d", ctx.Repo.Repository.ID, issue.ID, comment.ID) + ctx.Redirect(fmt.Sprintf("%s/issues/%d#%s", ctx.Repo.RepoLink, issue.Index, comment.HashTag())) } func Labels(ctx *middleware.Context) { ctx.Data["Title"] = ctx.Tr("repo.labels") ctx.Data["PageIsLabels"] = true + ctx.Data["RequireMinicolors"] = true ctx.HTML(200, LABELS) } @@ -927,7 +826,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 +838,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 +859,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 +876,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 +893,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 @@ -1018,6 +917,7 @@ func Milestones(ctx *middleware.Context) { func NewMilestone(ctx *middleware.Context) { ctx.Data["Title"] = ctx.Tr("repo.milestones.new") ctx.Data["PageIsMilestones"] = true + ctx.Data["RequireDatetimepicker"] = true ctx.Data["DateLang"] = setting.DateLang(ctx.Locale.Language()) ctx.HTML(200, MILESTONE_NEW) } @@ -1025,6 +925,7 @@ func NewMilestone(ctx *middleware.Context) { func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) { ctx.Data["Title"] = ctx.Tr("repo.milestones.new") ctx.Data["PageIsMilestones"] = true + ctx.Data["RequireDatetimepicker"] = true ctx.Data["DateLang"] = setting.DateLang(ctx.Locale.Language()) if ctx.HasError() { @@ -1043,7 +944,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, @@ -1060,6 +961,7 @@ func EditMilestone(ctx *middleware.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.GetMilestoneByID(ctx.ParamsInt64(":id")) @@ -1083,6 +985,7 @@ func EditMilestonePost(ctx *middleware.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() { @@ -1167,25 +1070,6 @@ func DeleteMilestone(ctx *middleware.Context) { }) } -func IssueGetAttachment(ctx *middleware.Context) { - id := com.StrTo(ctx.Params(":id")).MustInt64() - if id == 0 { - ctx.Error(404) - return - } - - attachment, err := models.GetAttachmentById(id) - - if err != nil { - ctx.Handle(404, "models.GetAttachmentById", err) - return - } - - // Fix #312. Attachments with , in their name are not handled correctly by Google Chrome. - // We must put the name in " manually. - ctx.ServeFile(attachment.Path, "\""+attachment.Name+"\"") -} - func PullRequest2(ctx *middleware.Context) { ctx.HTML(200, "repo/pr2/list") } |