From 4617bef8954deeef5bd2ba36d84aba3b05a4dd83 Mon Sep 17 00:00:00 2001 From: Justin Nuß Date: Wed, 23 Jul 2014 21:15:47 +0200 Subject: WIP: Allow attachments for comments --- public/js/app.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'public/js/app.js') diff --git a/public/js/app.js b/public/js/app.js index 7d4e7839..77719efe 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -520,6 +520,19 @@ function initIssue() { }); }()); + (function() { + var $attached = $("#attached"); + var $attachments = $("input[name=attachments]"); + var $addButton = $("#attachments-button"); + + var accepted = $addButton.attr("data-accept"); + + $addButton.on("click", function() { + // TODO: (nuss-justin): open dialog, upload file, add id to list, add file to $attached list + return false; + }); + }()); + // issue edit mode (function () { $("#issue-edit-btn").on("click", function () { -- cgit v1.2.3 From 34304e6a0c9a3904b999e3ae1fcc9e6518d3f026 Mon Sep 17 00:00:00 2001 From: Justin Nuß Date: Wed, 23 Jul 2014 21:24:24 +0200 Subject: WIP: Allow attachments for issues, not only comments --- models/issue.go | 18 +++++++++++++++--- public/js/app.js | 1 + routers/repo/issue.go | 7 +++++++ templates/repo/issue/create.tmpl | 6 ++++++ templates/repo/issue/view.tmpl | 5 +++++ 5 files changed, 34 insertions(+), 3 deletions(-) (limited to 'public/js/app.js') diff --git a/models/issue.go b/models/issue.go index 90ef287c..c0f2da2f 100644 --- a/models/issue.go +++ b/models/issue.go @@ -96,6 +96,11 @@ func (i *Issue) GetAssignee() (err error) { return err } +func (i *Issue) Attachments() []*Attachment { + a, _ := GetAttachmentsForIssue(i.Id) + return a +} + func (i *Issue) AfterDelete() { _, err := DeleteAttachmentsByIssue(i.Id, true) @@ -871,8 +876,9 @@ func GetIssueComments(issueId int64) ([]Comment, error) { } // Attachments returns the attachments for this comment. -func (c *Comment) Attachments() ([]*Attachment, error) { - return GetAttachmentsByComment(c.Id) +func (c *Comment) Attachments() []*Attachment { + a, _ := GetAttachmentsByComment(c.Id) + return a } func (c *Comment) AfterDelete() { @@ -928,10 +934,16 @@ func GetAttachmentById(id int64) (*Attachment, error) { return m, nil } +func GetAttachmentsForIssue(issueId int64) ([]*Attachment, error) { + attachments := make([]*Attachment, 0, 10) + err := x.Where("issue_id = ?", issueId).Where("comment_id = 0").Find(&attachments) + return attachments, err +} + // GetAttachmentsByIssue returns a list of attachments for the given issue func GetAttachmentsByIssue(issueId int64) ([]*Attachment, error) { attachments := make([]*Attachment, 0, 10) - err := x.Where("issue_id = ?", issueId).Find(&attachments) + err := x.Where("issue_id = ?", issueId).Where("comment_id > 0").Find(&attachments) return attachments, err } diff --git a/public/js/app.js b/public/js/app.js index 77719efe..16d1d5da 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -525,6 +525,7 @@ function initIssue() { var $attachments = $("input[name=attachments]"); var $addButton = $("#attachments-button"); + var commentId = $addButton.attr("data-comment-id"); // "0" == for issue, "" == for comment var accepted = $addButton.attr("data-accept"); $addButton.on("click", function() { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 9a265e09..abcf43a9 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -173,7 +173,10 @@ func CreateIssue(ctx *middleware.Context, params martini.Params) { ctx.Handle(500, "issue.CreateIssue(GetCollaborators)", err) return } + + ctx.Data["AllowedTypes"] = setting.AttachmentAllowedTypes ctx.Data["Collaborators"] = us + ctx.HTML(200, ISSUE_CREATE) } @@ -1030,6 +1033,10 @@ func IssuePostAttachment(ctx *middleware.Context, params martini.Params) { return } + if commentId == 0 { + commentId = -1 + } + file, header, err := ctx.Req.FormFile("attachment") if err != nil { diff --git a/templates/repo/issue/create.tmpl b/templates/repo/issue/create.tmpl index b548b1e7..b7f281c5 100644 --- a/templates/repo/issue/create.tmpl +++ b/templates/repo/issue/create.tmpl @@ -101,8 +101,14 @@
loading...
+
+
+
+ + +
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index 246055e1..500d3ce3 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -46,6 +46,11 @@
+
+ {{range .Attachments}} + {{.Name}} + {{end}} +
{{range .Comments}} -- cgit v1.2.3 From 43e5de7f830a098582b519706f9c5da6eecd2c3e Mon Sep 17 00:00:00 2001 From: Justin Nuß Date: Thu, 24 Jul 2014 13:50:03 +0200 Subject: Show attachments in issues/comments and add preview for images --- cmd/web.go | 15 ++++++------ public/css/gogs.css | 25 +++++++++++++++++++ public/js/app.js | 55 ++++++++++++++++++++++++++++++++++++++++++ routers/repo/issue.go | 46 +++++++++++++++++++++++++++++------ templates/repo/issue/view.tmpl | 28 +++++++++++++++------ 5 files changed, 145 insertions(+), 24 deletions(-) (limited to 'public/js/app.js') diff --git a/cmd/web.go b/cmd/web.go index 0b7aac33..aea0cd86 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -238,14 +238,6 @@ func runWeb(*cli.Context) { r.Post("/:index/label", repo.UpdateIssueLabel) r.Post("/:index/milestone", repo.UpdateIssueMilestone) r.Post("/:index/assignee", repo.UpdateAssignee) - - m.Group("/:index/attachment", func(r martini.Router) { - r.Get("/:id", repo.IssueGetAttachment) - r.Post("/", repo.IssuePostAttachment) - r.Post("/:comment", repo.IssuePostAttachment) - r.Delete("/:comment/:id", repo.IssueDeleteAttachment) - }) - r.Post("/labels/new", bindIgnErr(auth.CreateLabelForm{}), repo.NewLabel) r.Post("/labels/edit", bindIgnErr(auth.CreateLabelForm{}), repo.UpdateLabel) r.Post("/labels/delete", repo.DeleteLabel) @@ -262,6 +254,13 @@ func runWeb(*cli.Context) { r.Get("/releases/edit/:tagname", repo.EditRelease) }, reqSignIn, middleware.RepoAssignment(true)) + m.Group("/:username/:reponame/issues/:index/attachment", func(r martini.Router) { + r.Get("/:id", repo.IssueGetAttachment) + r.Post("/", repo.IssuePostAttachment) + r.Post("/:comment", repo.IssuePostAttachment) + r.Delete("/:comment/:id", repo.IssueDeleteAttachment) + }, reqSignIn, middleware.RepoAssignment(true), middleware.Toggle(&middleware.ToggleOptions{DisableCsrf: true})) + m.Group("/:username/:reponame", func(r martini.Router) { r.Post("/releases/new", bindIgnErr(auth.NewReleaseForm{}), repo.NewReleasePost) r.Post("/releases/edit/:tagname", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost) diff --git a/public/css/gogs.css b/public/css/gogs.css index 710d0c20..e78d7f94 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -1794,4 +1794,29 @@ body { color: #444; font-weight: bold; line-height: 30px; +} + +.issue-main .attachments { + margin: 0px 10px 10px 10px; +} + +.issue-main .attachments .attachment-label { + margin-right: 5px; +} + +.attachment-preview { + position: absolute; + top: 0px; + bottom: 0px; + + margin: 5px; + padding: 8px; + + background: #fff; + border: 1px solid #d8d8d8; + box-shadow: 0 0 5px 1px #d8d8d8; +} + +.attachment-preview-img { + border: 1px solid #d8d8d8; } \ No newline at end of file diff --git a/public/js/app.js b/public/js/app.js index 16d1d5da..3d4ed623 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -520,6 +520,61 @@ function initIssue() { }); }()); + // Preview for images. + (function() { + var $hoverElement = $("
"); + var $hoverImage = $(""); + + $hoverElement.addClass("attachment-preview"); + $hoverElement.hide(); + + $hoverImage.addClass("attachment-preview-img"); + + $hoverElement.append($hoverImage); + $(document.body).append($hoverElement); + + var over = function() { + var $this = $(this); + + if ($this.text().match(/\.(png|jpg|jpeg|gif)$/) == false) { + return; + } + + if ($hoverImage.attr("src") != $this.attr("href")) { + $hoverImage.attr("src", $this.attr("href")); + $hoverImage.load(function() { + var height = this.height; + var width = this.width; + + if (height > 300) { + var factor = 300 / height; + + height = factor * height; + width = factor * width; + } + + $hoverImage.css({"height": height, "width": width}); + + var offset = $this.offset(); + var left = offset.left, top = offset.top + $this.height() + 5; + + $hoverElement.css({"top": top + "px", "left": left + "px"}); + $hoverElement.css({"height": height + 16, "width": width + 16}); + $hoverElement.show(); + }); + } else { + $hoverElement.show(); + } + }; + + var out = function() { + $hoverElement.hide(); + }; + + $(".issue-main .attachments .attachment").hover(over, out); + }()); + + // Upload. (function() { var $attached = $("#attached"); var $attachments = $("input[name=attachments]"); diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 6becb2df..903a32d9 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -709,6 +709,12 @@ func Comment(ctx *middleware.Context, params martini.Params) { attachments := strings.Split(params["attachments"], ",") for _, a := range attachments { + a = strings.Trim(a, " ") + + if len(a) == 0 { + continue + } + aId, err := base.StrTo(a).Int64() if err != nil { @@ -1002,12 +1008,23 @@ func UpdateMilestonePost(ctx *middleware.Context, params martini.Params, form au } func IssuePostAttachment(ctx *middleware.Context, params martini.Params) { - issueId, _ := base.StrTo(params["index"]).Int64() + index, _ := base.StrTo(params["index"]).Int64() - if issueId == 0 { + if index == 0 { ctx.JSON(400, map[string]interface{}{ "ok": false, - "error": "invalid issue id", + "error": "invalid issue index", + }) + + return + } + + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index) + + if err != nil { + ctx.JSON(400, map[string]interface{}{ + "ok": false, + "error": "invalid comment id", }) return @@ -1089,7 +1106,7 @@ func IssuePostAttachment(ctx *middleware.Context, params martini.Params) { return } - a, err := models.CreateAttachment(issueId, commentId, header.Filename, out.Name()) + a, err := models.CreateAttachment(issue.Id, commentId, header.Filename, out.Name()) if err != nil { ctx.JSON(500, map[string]interface{}{ @@ -1121,16 +1138,29 @@ func IssueGetAttachment(ctx *middleware.Context, params martini.Params) { return } + log.Error("path=%s name=%s", attachment.Path, attachment.Name) + ctx.ServeFile(attachment.Path, attachment.Name) } func IssueDeleteAttachment(ctx *middleware.Context, params martini.Params) { - issueId, _ := base.StrTo(params["index"]).Int64() + index, _ := base.StrTo(params["index"]).Int64() - if issueId == 0 { + if index == 0 { ctx.JSON(400, map[string]interface{}{ "ok": false, - "error": "invalid issue id", + "error": "invalid issue index", + }) + + return + } + + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index) + + if err != nil { + ctx.JSON(400, map[string]interface{}{ + "ok": false, + "error": "invalid comment id", }) return @@ -1189,7 +1219,7 @@ func IssueDeleteAttachment(ctx *middleware.Context, params martini.Params) { return } - if attachment.IssueId != issueId { + if attachment.IssueId != issue.Id { ctx.JSON(400, map[string]interface{}{ "ok": false, "error": "attachment not associated with the given issue", diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index a3362054..8c90f312 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -45,13 +45,19 @@
Loading...
- -
- {{range .Attachments}} - {{.Name}} - {{end}} -
+ + {{with $attachments := .Issue.Attachments}} + {{if $attachments}} +
+ Attachments: + + {{range $attachments}} + {{.Name}} + {{end}} +
+ {{end}} + {{end}} {{range .Comments}} {{/* 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE, 4 = COMMIT, 5 = PULL */}} @@ -68,11 +74,17 @@
{{str2html .Content}}
+ {{with $attachments := .Attachments}} + {{if $attachments}}
- {{range .Attachments}} - {{.Name}} + Attachments: + + {{range $attachments}} + {{.Name}} {{end}}
+ {{end}} + {{end}} {{else if eq .Type 1}} -- cgit v1.2.3 From bfe5b86004791823b198be76084aa128d262b290 Mon Sep 17 00:00:00 2001 From: Justin Nuß Date: Thu, 24 Jul 2014 15:19:59 +0200 Subject: Add file upload for attachments --- cmd/web.go | 8 +- models/issue.go | 18 --- modules/middleware/context.go | 10 +- modules/setting/setting.go | 4 + public/css/gogs.css | 17 +++ public/js/app.js | 27 +++- routers/repo/issue.go | 321 +++++++++------------------------------ templates/repo/issue/create.tmpl | 15 +- templates/repo/issue/view.tmpl | 15 +- 9 files changed, 132 insertions(+), 303 deletions(-) (limited to 'public/js/app.js') diff --git a/cmd/web.go b/cmd/web.go index aea0cd86..bb020fab 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -238,6 +238,7 @@ func runWeb(*cli.Context) { r.Post("/:index/label", repo.UpdateIssueLabel) r.Post("/:index/milestone", repo.UpdateIssueMilestone) r.Post("/:index/assignee", repo.UpdateAssignee) + r.Get("/:index/attachment/:id", repo.IssueGetAttachment) r.Post("/labels/new", bindIgnErr(auth.CreateLabelForm{}), repo.NewLabel) r.Post("/labels/edit", bindIgnErr(auth.CreateLabelForm{}), repo.UpdateLabel) r.Post("/labels/delete", repo.DeleteLabel) @@ -254,13 +255,6 @@ func runWeb(*cli.Context) { r.Get("/releases/edit/:tagname", repo.EditRelease) }, reqSignIn, middleware.RepoAssignment(true)) - m.Group("/:username/:reponame/issues/:index/attachment", func(r martini.Router) { - r.Get("/:id", repo.IssueGetAttachment) - r.Post("/", repo.IssuePostAttachment) - r.Post("/:comment", repo.IssuePostAttachment) - r.Delete("/:comment/:id", repo.IssueDeleteAttachment) - }, reqSignIn, middleware.RepoAssignment(true), middleware.Toggle(&middleware.ToggleOptions{DisableCsrf: true})) - m.Group("/:username/:reponame", func(r martini.Router) { r.Post("/releases/new", bindIgnErr(auth.NewReleaseForm{}), repo.NewReleasePost) r.Post("/releases/edit/:tagname", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost) diff --git a/models/issue.go b/models/issue.go index f16c384b..9422a738 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1085,21 +1085,3 @@ func DeleteAttachmentsByComment(commentId int64, remove bool) (int, error) { return DeleteAttachments(attachments, remove) } - -// AssignAttachment assigns the given attachment to the specified comment -func AssignAttachment(issueId, commentId, attachmentId int64) error { - a, err := GetAttachmentById(attachmentId) - - if err != nil { - return err - } - - if a.IssueId != issueId { - return ErrAttachmentNotLinked - } - - a.CommentId = commentId - - _, err = x.Id(a.Id).Update(a) - return err -} diff --git a/modules/middleware/context.go b/modules/middleware/context.go index c641449a..6b47e94f 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -323,7 +323,6 @@ func (f *Flash) Success(msg string) { // InitContext initializes a classic context for a request. func InitContext() martini.Handler { return func(res http.ResponseWriter, r *http.Request, c martini.Context, rd *Render) { - ctx := &Context{ c: c, // p: p, @@ -332,7 +331,6 @@ func InitContext() martini.Handler { Cache: setting.Cache, Render: rd, } - ctx.Data["PageStartTime"] = time.Now() // start session @@ -374,6 +372,14 @@ func InitContext() martini.Handler { ctx.Data["IsAdmin"] = ctx.User.IsAdmin } + // If request sends files, parse them here otherwise the Query() can't be parsed and the CsrfToken will be invalid. + if strings.Contains(r.Header.Get("Content-Type"), "multipart/form-data") { + if err = ctx.Req.ParseMultipartForm(setting.AttachmentMaxSize << 20); err != nil { // 32MB max size + ctx.Handle(500, "issue.Comment(ctx.Req.ParseMultipartForm)", err) + return + } + } + // get or create csrf token ctx.Data["CsrfToken"] = ctx.CsrfToken() ctx.Data["CsrfTokenHtml"] = template.HTML(``) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index ba9e86dc..349ef115 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -74,6 +74,8 @@ var ( // Attachment settings. AttachmentPath string AttachmentAllowedTypes string + AttachmentMaxSize int64 + AttachmentMaxFiles int // Cache settings. Cache cache.Cache @@ -172,6 +174,8 @@ func NewConfigContext() { AttachmentPath = Cfg.MustValue("attachment", "PATH", "files/attachments") AttachmentAllowedTypes = Cfg.MustValue("attachment", "ALLOWED_TYPES", "*/*") + AttachmentMaxSize = Cfg.MustInt64("attachment", "MAX_SIZE", 32) + AttachmentMaxFiles = Cfg.MustInt("attachment", "MAX_FILES", 10) if err = os.MkdirAll(AttachmentPath, os.ModePerm); err != nil { log.Fatal("Could not create directory %s: %s", AttachmentPath, err) diff --git a/public/css/gogs.css b/public/css/gogs.css index e78d7f94..cc48f211 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -1819,4 +1819,21 @@ body { .attachment-preview-img { border: 1px solid #d8d8d8; +} + +#attachments-button { + float: left; +} + +#attached { + height: 18px; + margin: 10px 10px 15px 10px; +} + +#attached-list .label { + margin-right: 10px; +} + +#issue-create-form #attached { + margin-bottom: 0; } \ No newline at end of file diff --git a/public/js/app.js b/public/js/app.js index 3d4ed623..7ffcbd4a 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -536,7 +536,7 @@ function initIssue() { var over = function() { var $this = $(this); - if ($this.text().match(/\.(png|jpg|jpeg|gif)$/) == false) { + if ($this.text().match(/\.(png|jpg|jpeg|gif)$/i) == false) { return; } @@ -576,15 +576,30 @@ function initIssue() { // Upload. (function() { - var $attached = $("#attached"); - var $attachments = $("input[name=attachments]"); + var $attachedList = $("#attached-list"); var $addButton = $("#attachments-button"); - var commentId = $addButton.attr("data-comment-id"); // "0" == for issue, "" == for comment - var accepted = $addButton.attr("data-accept"); + var fileInput = $("#attachments-input")[0]; + + fileInput.addEventListener("change", function(event) { + $attachedList.empty(); + $attachedList.append("Attachments: "); + + for (var index = 0; index < fileInput.files.length; index++) { + var file = fileInput.files[index]; + + var $span = $(""); + + $span.addClass("label"); + $span.addClass("label-default"); + + $span.append(file.name.toLowerCase()); + $attachedList.append($span); + } + }); $addButton.on("click", function() { - // TODO: (nuss-justin): open dialog, upload file, add id to list, add file to $attached list + fileInput.click(); return false; }); }()); diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 903a32d9..81261e6c 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -5,6 +5,7 @@ package repo import ( + "errors" "fmt" "io" "io/ioutil" @@ -35,6 +36,11 @@ const ( MILESTONE_EDIT base.TplName = "repo/issue/milestone_edit" ) +var ( + ErrFileTypeForbidden = errors.New("File type is not allowed") + ErrTooManyFiles = errors.New("Maximum number of files to upload exceeded") +) + func Issues(ctx *middleware.Context) { ctx.Data["Title"] = "Issues" ctx.Data["IsRepoToolbarIssues"] = true @@ -233,6 +239,8 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C return } + uploadFiles(ctx, issue.Id, 0) + // Update mentions. ms := base.MentionPattern.FindAllString(issue.Content, -1) if len(ms) > 0 { @@ -619,6 +627,67 @@ func UpdateAssignee(ctx *middleware.Context) { }) } +func uploadFiles(ctx *middleware.Context, issueId, commentId int64) { + allowedTypes := strings.Split(setting.AttachmentAllowedTypes, "|") + attachments := ctx.Req.MultipartForm.File["attachments"] + + if len(attachments) > setting.AttachmentMaxFiles { + ctx.Handle(400, "issue.Comment", ErrTooManyFiles) + return + } + + for _, header := range attachments { + file, err := header.Open() + + if err != nil { + ctx.Handle(500, "issue.Comment(header.Open)", err) + return + } + + defer file.Close() + + allowed := false + fileType := mime.TypeByExtension(header.Filename) + + 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, "issue.Comment(ioutil.TempFile)", err) + return + } + + defer out.Close() + + _, err = io.Copy(out, file) + + if err != nil { + ctx.Handle(500, "issue.Comment(io.Copy)", err) + return + } + + _, err = models.CreateAttachment(issueId, commentId, header.Filename, out.Name()) + + if err != nil { + ctx.Handle(500, "issue.Comment(io.Copy)", err) + return + } + } +} + func Comment(ctx *middleware.Context, params martini.Params) { index, err := base.StrTo(ctx.Query("issueIndex")).Int64() if err != nil { @@ -706,28 +775,8 @@ func Comment(ctx *middleware.Context, params martini.Params) { } } - attachments := strings.Split(params["attachments"], ",") - - for _, a := range attachments { - a = strings.Trim(a, " ") - - if len(a) == 0 { - continue - } - - aId, err := base.StrTo(a).Int64() - - if err != nil { - ctx.Handle(400, "issue.Comment(base.StrTo.Int64)", err) - return - } - - err = models.AssignAttachment(issue.Id, comment.Id, aId) - - if err != nil { - ctx.Handle(400, "issue.Comment(models.AssignAttachment)", err) - return - } + if comment != nil { + uploadFiles(ctx, issue.Id, comment.Id) } // Notify watchers. @@ -1007,122 +1056,6 @@ func UpdateMilestonePost(ctx *middleware.Context, params martini.Params, form au ctx.Redirect(ctx.Repo.RepoLink + "/issues/milestones") } -func IssuePostAttachment(ctx *middleware.Context, params martini.Params) { - index, _ := base.StrTo(params["index"]).Int64() - - if index == 0 { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "invalid issue index", - }) - - return - } - - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index) - - if err != nil { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "invalid comment id", - }) - - return - } - - commentId, err := base.StrTo(params["comment"]).Int64() - - if err != nil && len(params["comment"]) > 0 { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "invalid comment id", - }) - - return - } - - if commentId == 0 { - commentId = -1 - } - - file, header, err := ctx.Req.FormFile("attachment") - - if err != nil { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "upload error", - }) - - return - } - - defer file.Close() - - // check mime type, write to file, insert attachment to db - allowedTypes := strings.Split(setting.AttachmentAllowedTypes, "|") - allowed := false - - fileType := mime.TypeByExtension(header.Filename) - - for _, t := range allowedTypes { - t := strings.Trim(t, " ") - - if t == "*/*" || t == fileType { - allowed = true - break - } - } - - if !allowed { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "mime type not allowed", - }) - - return - } - - out, err := ioutil.TempFile(setting.AttachmentPath, "attachment_") - - if err != nil { - ctx.JSON(500, map[string]interface{}{ - "ok": false, - "error": "internal server error", - }) - - return - } - - defer out.Close() - - _, err = io.Copy(out, file) - - if err != nil { - ctx.JSON(500, map[string]interface{}{ - "ok": false, - "error": "internal server error", - }) - - return - } - - a, err := models.CreateAttachment(issue.Id, commentId, header.Filename, out.Name()) - - if err != nil { - ctx.JSON(500, map[string]interface{}{ - "ok": false, - "error": "internal server error", - }) - - return - } - - ctx.JSON(500, map[string]interface{}{ - "ok": true, - "id": a.Id, - }) -} - func IssueGetAttachment(ctx *middleware.Context, params martini.Params) { id, err := base.StrTo(params["id"]).Int64() @@ -1138,117 +1071,5 @@ func IssueGetAttachment(ctx *middleware.Context, params martini.Params) { return } - log.Error("path=%s name=%s", attachment.Path, attachment.Name) - ctx.ServeFile(attachment.Path, attachment.Name) } - -func IssueDeleteAttachment(ctx *middleware.Context, params martini.Params) { - index, _ := base.StrTo(params["index"]).Int64() - - if index == 0 { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "invalid issue index", - }) - - return - } - - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index) - - if err != nil { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "invalid comment id", - }) - - return - } - - commentId, err := base.StrTo(params["comment"]).Int64() - - if err != nil || commentId < 0 { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "invalid comment id", - }) - - return - } - - comment, err := models.GetCommentById(commentId) - - if err != nil { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "invalid issue id", - }) - - return - } - - if comment.PosterId != ctx.User.Id && !ctx.User.IsAdmin { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "no permissions", - }) - - return - } - - attachmentId, err := base.StrTo(params["id"]).Int64() - - if err != nil { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "invalid attachment id", - }) - - return - } - - attachment, err := models.GetAttachmentById(attachmentId) - - if err != nil { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "wrong attachment id", - }) - - return - } - - if attachment.IssueId != issue.Id { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "attachment not associated with the given issue", - }) - - return - } - - if attachment.CommentId != commentId { - ctx.JSON(400, map[string]interface{}{ - "ok": false, - "error": "attachment not associated with the given comment", - }) - - return - } - - err = models.DeleteAttachment(attachment, true) - - if err != nil { - ctx.JSON(500, map[string]interface{}{ - "ok": false, - "error": "could not delete attachment", - }) - - return - } - - ctx.JSON(200, map[string]interface{}{ - "ok": true, - }) -} diff --git a/templates/repo/issue/create.tmpl b/templates/repo/issue/create.tmpl index 1146a466..0d72123b 100644 --- a/templates/repo/issue/create.tmpl +++ b/templates/repo/issue/create.tmpl @@ -4,7 +4,7 @@ {{template "repo/toolbar" .}}
-
+ {{.CsrfTokenHtml}} {{template "base/alert" .}}
@@ -101,18 +101,13 @@
loading...
-
- - + +
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index 8c90f312..dd200e80 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -117,7 +117,7 @@
{{if .SignedUser}}
- + {{.CsrfTokenHtml}}
@@ -137,18 +137,13 @@
Loading...
-
- - + + {{if .IsIssueOwner}}{{if .Issue.IsClosed}} {{else}} {{end}}{{end}}   -- cgit v1.2.3