tdsds.com/gitea
tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-23 09:04:26 +00:00
Code Releases Activity

WIP: Allow attachments for issues, not only comments

Browse Source
This commit is contained in:
Justin Nuß 2014-07-23 21:24:24 +02:00
parent 4617bef895
commit 34304e6a0c
5 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
models/issue.go
View File

@ -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
}

1
public/js/app.js
View File

@ -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() {

7
routers/repo/issue.go
View File

@ -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 {

6
templates/repo/issue/create.tmpl
View File

@ -101,8 +101,14 @@
<div class="tab-pane issue-preview-content" id="issue-preview">loading...</div>
</div>
</div>
<div>
<div id="attached"></div>
</div>
<div class="text-right panel-body">
<div class="form-group">
<input type="hidden" name="attachments" value="" />
<button data-accept="{{AllowedTypes}}" data-comment-id="0" class="btn-default btn attachment-add" id="attachments-button">Add Attachments...</button>
<input type="hidden" value="id" name="repo-id"/>
<button class="btn-success btn">Create new issue</button>
</div>

5
templates/repo/issue/view.tmpl
View File

@ -46,6 +46,11 @@
</div>
</div>
</div>
<div class="attachments">
{{range .Attachments}}
<a class="attachment" href="{{.IssueId}}/attachment/{{.Id}}">{{.Name}}</a>
{{end}}
</div>
</div>
</div>
{{range .Comments}}