diff options
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/repo/download.go | 7 | ||||
| -rw-r--r-- | routers/repo/issue.go | 531 | ||||
| -rw-r--r-- | routers/repo/repo.go | 5 | ||||
| -rw-r--r-- | routers/user/auth.go | 45 | ||||
| -rw-r--r-- | routers/user/home.go | 4 |
5 files changed, 209 insertions, 383 deletions
diff --git a/routers/repo/download.go b/routers/repo/download.go index a0a7823b52..d657d9b18c 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -21,12 +21,7 @@ func ServeData(ctx *middleware.Context, name string, reader io.Reader) error { } _, isTextFile := base.IsTextFile(buf) - if isTextFile { - charset, _ := base.DetectEncoding(buf) - if charset != "UTF-8" { - ctx.Resp.Header().Set("Content-Type", "text/plain; charset="+charset) - } - } else { + if ! isTextFile { _, isImageFile := base.IsImageFile(buf) if !isImageFile { ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName)) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 20a6331f1f..4072483e89 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -59,6 +59,7 @@ func Issues(ctx *middleware.Context) { ctx.Data["PageIsIssueList"] = true viewType := ctx.Query("type") + sortType := ctx.Query("sort") types := []string{"assigned", "created_by", "mentioned"} if !com.IsSliceContainsStr(types, viewType) { viewType = "all" @@ -71,7 +72,10 @@ func Issues(ctx *middleware.Context) { return } - var assigneeID, posterID int64 + var ( + assigneeID = ctx.QueryInt64("assignee") + posterID int64 + ) filterMode := models.FM_ALL switch viewType { case "assigned": @@ -93,7 +97,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, assigneeID, isShowClosed, filterMode) page := ctx.QueryInt("page") if page <= 1 { @@ -110,7 +114,7 @@ func Issues(ctx *middleware.Context) { // Get issues. issues, err := models.Issues(uid, assigneeID, repo.ID, posterID, milestoneID, - page, isShowClosed, filterMode == models.FM_MENTION, selectLabels, ctx.Query("sortType")) + page, isShowClosed, filterMode == models.FM_MENTION, selectLabels, sortType) if err != nil { ctx.Handle(500, "Issues: %v", err) return @@ -151,17 +155,25 @@ func Issues(ctx *middleware.Context) { ctx.Data["Issues"] = issues // Get milestones. - miles, err := models.GetAllRepoMilestones(repo.ID) + ctx.Data["Milestones"], err = models.GetAllRepoMilestones(repo.ID) if err != nil { ctx.Handle(500, "GetAllRepoMilestones: %v", err) return } - ctx.Data["Milestones"] = miles + + // Get assignees. + ctx.Data["Assignees"], err = repo.GetAssignees() + if err != nil { + ctx.Handle(500, "GetAssignees: %v", err) + return + } ctx.Data["IssueStats"] = issueStats ctx.Data["SelectLabels"] = com.StrTo(selectLabels).MustInt64() ctx.Data["ViewType"] = viewType + ctx.Data["SortType"] = sortType ctx.Data["MilestoneID"] = milestoneID + ctx.Data["AssigneeID"] = assigneeID ctx.Data["IsShowClosed"] = isShowClosed if isShowClosed { ctx.Data["State"] = "closed" @@ -172,15 +184,19 @@ func Issues(ctx *middleware.Context) { ctx.HTML(200, ISSUES) } +func renderAttachmentSettings(ctx *middleware.Context) { + ctx.Data["IsAttachmentEnabled"] = setting.AttachmentEnabled + ctx.Data["AttachmentAllowedTypes"] = setting.AttachmentAllowedTypes + ctx.Data["AttachmentMaxFiles"] = setting.AttachmentMaxFiles +} + func NewIssue(ctx *middleware.Context) { ctx.Data["Title"] = ctx.Tr("repo.issues.new") ctx.Data["PageIsIssueList"] = true ctx.Data["RequireDropzone"] = true - ctx.Data["IsAttachmentEnabled"] = setting.AttachmentEnabled - ctx.Data["AttachmentAllowedTypes"] = setting.AttachmentAllowedTypes - ctx.Data["AttachmentMaxFiles"] = setting.AttachmentMaxFiles + renderAttachmentSettings(ctx) - if ctx.User.IsAdmin { + if ctx.Repo.IsAdmin() { var ( repo = ctx.Repo.Repository err error @@ -216,9 +232,7 @@ func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { ctx.Data["Title"] = ctx.Tr("repo.issues.new") ctx.Data["PageIsIssueList"] = true ctx.Data["RequireDropzone"] = true - ctx.Data["IsAttachmentEnabled"] = setting.AttachmentEnabled - ctx.Data["AttachmentAllowedTypes"] = setting.AttachmentAllowedTypes - ctx.Data["AttachmentMaxFiles"] = setting.AttachmentMaxFiles + renderAttachmentSettings(ctx) var ( repo = ctx.Repo.Repository @@ -227,7 +241,7 @@ func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { assigneeID int64 attachments []string ) - if ctx.User.IsAdmin { + if ctx.Repo.IsAdmin() { // Check labels. labelIDs = base.StringsToInt64s(strings.Split(form.LabelIDs, ",")) labelIDMark := base.Int64sToMap(labelIDs) @@ -286,7 +300,7 @@ func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { } if setting.AttachmentEnabled { - attachments = ctx.QueryStrings("attachments") + attachments = form.Attachments } if ctx.HasError() { @@ -397,128 +411,116 @@ func UploadIssueAttachment(ctx *middleware.Context) { }) } -func checkLabels(labels, allLabels []*models.Label) { - for _, l := range labels { - for _, l2 := range allLabels { - if l.ID == l2.ID { - l2.IsChecked = true - break - } - } - } -} - 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) - return - } + ctx.Data["PageIsIssueList"] = true + ctx.Data["RequireDropzone"] = true + renderAttachmentSettings(ctx) - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, idx) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { - if err == models.ErrIssueNotExist { + if models.IsErrIssueNotExist(err) { ctx.Handle(404, "GetIssueByIndex", err) } else { ctx.Handle(500, "GetIssueByIndex", err) } return } + 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)) + + repo := ctx.Repo.Repository - // Get labels. + // Metas. + // Check labels. if err = issue.GetLabels(); err != nil { ctx.Handle(500, "GetLabels", err) return } - labels, err := models.GetLabelsByRepoID(ctx.Repo.Repository.ID) + labelIDMark := make(map[int64]bool) + for i := range issue.Labels { + labelIDMark[issue.Labels[i].ID] = true + } + labels, err := models.GetLabelsByRepoID(repo.ID) if err != nil { - ctx.Handle(500, "GetLabels.2", err) + ctx.Handle(500, "GetLabelsByRepoID: %v", err) return } - checkLabels(issue.Labels, labels) + hasSelected := false + for i := range labels { + if labelIDMark[labels[i].ID] { + labels[i].IsChecked = true + hasSelected = true + } + } + ctx.Data["HasSelectedLabel"] = hasSelected ctx.Data["Labels"] = labels - // Get assigned milestone. - if issue.MilestoneID > 0 { - ctx.Data["Milestone"], err = models.GetMilestoneByID(issue.MilestoneID) + // Check milestone and assignee. + if ctx.Repo.IsAdmin() { + ctx.Data["OpenMilestones"], err = models.GetMilestones(repo.ID, -1, false) if err != nil { - if models.IsErrMilestoneNotExist(err) { - log.Warn("GetMilestoneById: %v", err) - } else { - ctx.Handle(500, "GetMilestoneById", err) - return - } + 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 } - } - - // 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 + ctx.Data["Assignees"], err = repo.GetAssignees() + if err != nil { + ctx.Handle(500, "GetAssignees: %v", 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 - } - 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 ( + 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.IsAdmin() || (ctx.IsSigned && issue.IsPoster(ctx.User.Id)) ctx.HTML(200, ISSUE_VIEW) } @@ -531,7 +533,7 @@ func UpdateIssue(ctx *middleware.Context, form auth.CreateIssueForm) { 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) @@ -565,112 +567,68 @@ func UpdateIssue(ctx *middleware.Context, form auth.CreateIssueForm) { }) } -func UpdateIssueLabel(ctx *middleware.Context) { - if !ctx.Repo.IsOwner() { - ctx.Error(403) - return - } - - idx := com.StrTo(ctx.Params(":index")).MustInt64() - if idx <= 0 { - ctx.Error(404) - return - } - - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, idx) +func getActionIssue(ctx *middleware.Context) *models.Issue { + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { - if err == models.ErrIssueNotExist { - ctx.Handle(404, "issue.UpdateIssueLabel(GetIssueByIndex)", err) + if models.IsErrIssueNotExist(err) { + ctx.Error(404, "GetIssueByIndex") } else { - ctx.Handle(500, "issue.UpdateIssueLabel(GetIssueByIndex)", err) + ctx.Handle(500, "GetIssueByIndex", err) } - return + return nil } + return issue +} - isAttach := ctx.Query("action") == "attach" - labelStrId := ctx.Query("id") - labelID := com.StrTo(labelStrId).MustInt64() - label, err := models.GetLabelByID(labelID) - if err != nil { - if models.IsErrLabelNotExist(err) { - ctx.Handle(404, "issue.UpdateIssueLabel(GetLabelById)", err) - } else { - ctx.Handle(500, "issue.UpdateIssueLabel(GetLabelById)", err) - } +func UpdateIssueLabel(ctx *middleware.Context) { + issue := getActionIssue(ctx) + if ctx.Written() { return } - isNeedUpdate := false - if isAttach { - if !issue.HasLabel(labelID) { - if err = issue.AddLabel(labelID); err != nil { - ctx.Handle(500, "AddLabel", err) - return - } - isNeedUpdate = true + if ctx.Query("action") == "clear" { + if err := issue.ClearLabels(); err != nil { + ctx.Handle(500, "ClearLabels", err) + return } } else { - if issue.HasLabel(labelID) { - if err = issue.RemoveLabel(labelID); err != nil { - ctx.Handle(500, "RemoveLabel", err) - return + isAttach := ctx.Query("action") == "attach" + label, err := models.GetLabelByID(ctx.QueryInt64("id")) + if err != nil { + if models.IsErrLabelNotExist(err) { + ctx.Error(404, "GetLabelByID") + } else { + ctx.Handle(500, "GetLabelByID", err) } - isNeedUpdate = true - } - } - - if isNeedUpdate { - if err = models.UpdateIssue(issue); err != nil { - ctx.Handle(500, "issue.UpdateIssueLabel(UpdateIssue)", err) return } - if isAttach { - label.NumIssues++ - if issue.IsClosed { - label.NumClosedIssues++ + if isAttach && !issue.HasLabel(label.ID) { + if err = issue.AddLabel(label); err != nil { + ctx.Handle(500, "AddLabel", err) + return } - } else { - label.NumIssues-- - if issue.IsClosed { - label.NumClosedIssues-- + } else if !isAttach && issue.HasLabel(label.ID) { + if err = issue.RemoveLabel(label); err != nil { + ctx.Handle(500, "RemoveLabel", err) + return } } - - if err = models.UpdateLabel(label); err != nil { - ctx.Handle(500, "issue.UpdateIssueLabel(UpdateLabel)", err) - return - } } + ctx.JSON(200, map[string]interface{}{ "ok": true, }) } func UpdateIssueMilestone(ctx *middleware.Context) { - if !ctx.Repo.IsOwner() { - ctx.Error(403) - return - } - - issueId := com.StrTo(ctx.Query("issue")).MustInt64() - if issueId == 0 { - ctx.Error(404) - return - } - - issue, err := models.GetIssueById(issueId) - if err != nil { - if err == models.ErrIssueNotExist { - ctx.Handle(404, "issue.UpdateIssueMilestone(GetIssueById)", err) - } else { - ctx.Handle(500, "issue.UpdateIssueMilestone(GetIssueById)", err) - } + issue := getActionIssue(ctx) + if ctx.Written() { return } oldMid := issue.MilestoneID - mid := com.StrTo(ctx.Query("milestoneid")).MustInt64() + mid := ctx.QueryInt64("id") if oldMid == mid { ctx.JSON(200, map[string]interface{}{ "ok": true, @@ -680,11 +638,8 @@ func UpdateIssueMilestone(ctx *middleware.Context) { // Not check for invalid milestone id and give responsibility to owners. issue.MilestoneID = mid - if err = models.ChangeMilestoneAssign(oldMid, issue); err != nil { - ctx.Handle(500, "issue.UpdateIssueMilestone(ChangeMilestoneAssign)", err) - return - } else if err = models.UpdateIssue(issue); err != nil { - ctx.Handle(500, "issue.UpdateIssueMilestone(UpdateIssue)", err) + if err := models.ChangeMilestoneAssign(oldMid, issue); err != nil { + ctx.Handle(500, "ChangeMilestoneAssign", err) return } @@ -693,36 +648,24 @@ func UpdateIssueMilestone(ctx *middleware.Context) { }) } -func UpdateAssignee(ctx *middleware.Context) { - if !ctx.Repo.IsOwner() { - ctx.Error(403) - return - } - - issueId := com.StrTo(ctx.Query("issue")).MustInt64() - if issueId == 0 { - ctx.Error(404) +func UpdateIssueAssignee(ctx *middleware.Context) { + issue := getActionIssue(ctx) + if ctx.Written() { return } - issue, err := models.GetIssueById(issueId) - if err != nil { - if err == models.ErrIssueNotExist { - ctx.Handle(404, "GetIssueById", err) - } else { - ctx.Handle(500, "GetIssueById", err) - } + aid := ctx.QueryInt64("id") + if issue.AssigneeID == aid { + ctx.JSON(200, map[string]interface{}{ + "ok": true, + }) return } - aid := com.StrTo(ctx.Query("assigneeid")).MustInt64() // Not check for invalid assignee id and give responsibility to owners. issue.AssigneeID = aid - if err = models.UpdateIssueUserByAssignee(issue.ID, aid); err != nil { - ctx.Handle(500, "UpdateIssueUserPairByAssignee: %v", err) - return - } else if err = models.UpdateIssue(issue); err != nil { - ctx.Handle(500, "UpdateIssue", err) + if err := models.UpdateIssueUserByAssignee(issue); err != nil { + ctx.Handle(500, "UpdateIssueUserByAssignee: %v", err) return } @@ -731,163 +674,76 @@ func UpdateAssignee(ctx *middleware.Context) { }) } -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(), - }) +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.JSON(status, map[string]interface{}{ - "ok": true, - "status": status, - "data": data, - }) + ctx.Handle(500, "GetIssueByIndex", err) } + return } - index := com.StrTo(ctx.Query("issueIndex")).MustInt64() - if index == 0 { - ctx.Error(404) + var attachments []string + if setting.AttachmentEnabled { + attachments = form.Attachments + } + + if ctx.HasError() { + ctx.Flash.Error(ctx.Data["ErrorMsg"].(string)) + ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index)) return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, index) - if err != nil { - if err == models.ErrIssueNotExist { - send(404, nil, err) - } else { - send(200, nil, err) + // Check if issue owner/poster changes the status of issue. + if (ctx.Repo.IsOwner() || (ctx.IsSigned && 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) + } + // 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 } - // 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") + comment, err := models.CreateIssueComment(ctx.User, ctx.Repo.Repository, issue, form.Content, attachments) + if err != nil { + ctx.Handle(500, "CreateIssueComment", err) + return } - 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 } @@ -896,12 +752,13 @@ 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) { diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 533bd569ad..1d29557005 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -214,9 +214,10 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) { } } - if strings.Contains(err.Error(), "Authentication failed") { + if strings.Contains(err.Error(), "Authentication failed") || + strings.Contains(err.Error(), " not found") { ctx.Data["Err_Auth"] = true - ctx.RenderWithErr(ctx.Tr("form.auth_failed", err), MIGRATE, &form) + ctx.RenderWithErr(ctx.Tr("form.auth_failed", strings.Replace(err.Error(), ":"+form.AuthPassword+"@", ":<password>@", 1)), MIGRATE, &form) return } diff --git a/routers/user/auth.go b/routers/user/auth.go index 4b29a29ec8..61e572f9bc 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -42,49 +42,22 @@ func SignIn(ctx *middleware.Context) { } // Check auto-login. - uname := ctx.GetCookie(setting.CookieUserName) - if len(uname) == 0 { - ctx.HTML(200, SIGNIN) - return - } - - isSucceed := false - defer func() { - if !isSucceed { - log.Trace("auto-login cookie cleared: %s", uname) - ctx.SetCookie(setting.CookieUserName, "", -1, setting.AppSubUrl) - ctx.SetCookie(setting.CookieRememberName, "", -1, setting.AppSubUrl) - return - } - }() - - u, err := models.GetUserByName(uname) + isSucceed, err := middleware.AutoSignIn(ctx) if err != nil { - if !models.IsErrUserNotExist(err) { - ctx.Handle(500, "GetUserByName", err) - } else { - ctx.HTML(200, SIGNIN) - } - return - } - - if val, _ := ctx.GetSuperSecureCookie( - base.EncodeMd5(u.Rands+u.Passwd), setting.CookieRememberName); val != u.Name { - ctx.HTML(200, SIGNIN) + ctx.Handle(500, "AutoSignIn", err) return } - isSucceed = true - - ctx.Session.Set("uid", u.Id) - ctx.Session.Set("uname", u.Name) - if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 { - ctx.SetCookie("redirect_to", "", -1, setting.AppSubUrl) - ctx.Redirect(redirectTo) + if isSucceed { + if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 { + ctx.SetCookie("redirect_to", "", -1, setting.AppSubUrl) + ctx.Redirect(redirectTo) + } + ctx.Redirect(setting.AppSubUrl + "/") return } - ctx.Redirect(setting.AppSubUrl + "/") + ctx.HTML(200, SIGNIN) } func SignInPost(ctx *middleware.Context, form auth.SignInForm) { diff --git a/routers/user/home.go b/routers/user/home.go index 1c9e82c6df..e77e3f4bb0 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -339,9 +339,9 @@ func Issues(ctx *middleware.Context) { issues := make([]*models.Issue, len(ius)) for i := range ius { - issues[i], err = models.GetIssueById(ius[i].IssueID) + issues[i], err = models.GetIssueByID(ius[i].IssueID) if err != nil { - if err == models.ErrIssueNotExist { + if models.IsErrIssueNotExist(err) { log.Warn("user.Issues(GetIssueById #%d): issue not exist", ius[i].IssueID) continue } else { |