@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra | |||
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) | |||
##### Current version: 0.8.57 | |||
##### Current version: 0.8.58 | |||
| Web | UI | Preview | | |||
|:-------------:|:-------:|:-------:| |
@@ -1064,6 +1064,8 @@ create_issue = `opened issue <a href="%s/issues/%s">%s#%[2]s</a>` | |||
close_issue = `closed issue <a href="%s/issues/%s">%s#%[2]s</a>` | |||
reopen_issue = `reopened issue <a href="%s/issues/%s">%s#%[2]s</a>` | |||
create_pull_request = `created pull request <a href="%s/pulls/%s">%s#%[2]s</a>` | |||
close_pull_request = `closed pull request <a href="%s/pulls/%s">%s#%[2]s</a>` | |||
reopen_pull_request = `reopened pull request <a href="%s/pulls/%s">%s#%[2]s</a>` | |||
comment_issue = `commented on issue <a href="%s/issues/%s">%s#%[2]s</a>` | |||
merge_pull_request = `merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>` | |||
transfer_repo = transfered repository <code>%s</code> to <a href="%s">%s</a> |
@@ -17,7 +17,7 @@ import ( | |||
"github.com/gogits/gogs/modules/setting" | |||
) | |||
const APP_VER = "0.8.57.0305" | |||
const APP_VER = "0.8.58.0305" | |||
func init() { | |||
runtime.GOMAXPROCS(runtime.NumCPU()) |
@@ -41,6 +41,8 @@ const ( | |||
ACTION_MERGE_PULL_REQUEST // 11 | |||
ACTION_CLOSE_ISSUE // 12 | |||
ACTION_REOPEN_ISSUE // 13 | |||
ACTION_CLOSE_PULL_REQUEST // 14 | |||
ACTION_REOPEN_PULL_REQUEST // 15 | |||
) | |||
var ( |
@@ -219,6 +219,7 @@ func (i *Issue) ReadBy(uid int64) error { | |||
} | |||
func (i *Issue) changeStatus(e *xorm.Session, doer *User, repo *Repository, isClosed bool) (err error) { | |||
// Nothing should be performed if current status is same as target status | |||
if i.IsClosed == isClosed { | |||
return nil | |||
} | |||
@@ -230,7 +231,7 @@ func (i *Issue) changeStatus(e *xorm.Session, doer *User, repo *Repository, isCl | |||
return err | |||
} | |||
// Update labels. | |||
// Update issue count of labels | |||
if err = i.getLabels(e); err != nil { | |||
return err | |||
} | |||
@@ -245,12 +246,12 @@ func (i *Issue) changeStatus(e *xorm.Session, doer *User, repo *Repository, isCl | |||
} | |||
} | |||
// Update milestone. | |||
// Update issue count of milestone | |||
if err = changeMilestoneIssueStats(e, i); err != nil { | |||
return err | |||
} | |||
// New action comment. | |||
// New action comment | |||
if _, err = createStatusComment(e, doer, repo, i); err != nil { | |||
return err | |||
} | |||
@@ -258,7 +259,7 @@ func (i *Issue) changeStatus(e *xorm.Session, doer *User, repo *Repository, isCl | |||
return nil | |||
} | |||
// ChangeStatus changes issue status to open/closed. | |||
// ChangeStatus changes issue status to open or closed. | |||
func (i *Issue) ChangeStatus(doer *User, repo *Repository, isClosed bool) (err error) { | |||
sess := x.NewSession() | |||
defer sessionRelease(sess) | |||
@@ -857,7 +858,7 @@ func UpdateIssue(issue *Issue) error { | |||
return updateIssue(x, issue) | |||
} | |||
// updateIssueCols updates specific fields of given issue. | |||
// updateIssueCols only updates values of specific columns for given issue. | |||
func updateIssueCols(e Engine, issue *Issue, cols ...string) error { | |||
_, err := e.Id(issue.ID).Cols(cols...).Update(issue) | |||
return err | |||
@@ -1241,270 +1242,6 @@ func DeleteMilestoneByID(id int64) error { | |||
return sess.Commit() | |||
} | |||
// _________ __ | |||
// \_ ___ \ ____ _____ _____ ____ _____/ |_ | |||
// / \ \/ / _ \ / \ / \_/ __ \ / \ __\ | |||
// \ \___( <_> ) Y Y \ Y Y \ ___/| | \ | | |||
// \______ /\____/|__|_| /__|_| /\___ >___| /__| | |||
// \/ \/ \/ \/ \/ | |||
// CommentType defines whether a comment is just a simple comment, an action (like close) or a reference. | |||
type CommentType int | |||
const ( | |||
// Plain comment, can be associated with a commit (CommitId > 0) and a line (Line > 0) | |||
COMMENT_TYPE_COMMENT CommentType = iota | |||
COMMENT_TYPE_REOPEN | |||
COMMENT_TYPE_CLOSE | |||
// References. | |||
COMMENT_TYPE_ISSUE_REF | |||
// Reference from a commit (not part of a pull request) | |||
COMMENT_TYPE_COMMIT_REF | |||
// Reference from a comment | |||
COMMENT_TYPE_COMMENT_REF | |||
// Reference from a pull request | |||
COMMENT_TYPE_PULL_REF | |||
) | |||
type CommentTag int | |||
const ( | |||
COMMENT_TAG_NONE CommentTag = iota | |||
COMMENT_TAG_POSTER | |||
COMMENT_TAG_ADMIN | |||
COMMENT_TAG_OWNER | |||
) | |||
// Comment represents a comment in commit and issue page. | |||
type Comment struct { | |||
ID int64 `xorm:"pk autoincr"` | |||
Type CommentType | |||
PosterID int64 | |||
Poster *User `xorm:"-"` | |||
IssueID int64 `xorm:"INDEX"` | |||
CommitID int64 | |||
Line int64 | |||
Content string `xorm:"TEXT"` | |||
RenderedContent string `xorm:"-"` | |||
Created time.Time `xorm:"CREATED"` | |||
// Reference issue in commit message | |||
CommitSHA string `xorm:"VARCHAR(40)"` | |||
Attachments []*Attachment `xorm:"-"` | |||
// For view issue page. | |||
ShowTag CommentTag `xorm:"-"` | |||
} | |||
func (c *Comment) AfterSet(colName string, _ xorm.Cell) { | |||
var err error | |||
switch colName { | |||
case "id": | |||
c.Attachments, err = GetAttachmentsByCommentID(c.ID) | |||
if err != nil { | |||
log.Error(3, "GetAttachmentsByCommentID[%d]: %v", c.ID, err) | |||
} | |||
case "poster_id": | |||
c.Poster, err = GetUserByID(c.PosterID) | |||
if err != nil { | |||
if IsErrUserNotExist(err) { | |||
c.PosterID = -1 | |||
c.Poster = NewFakeUser() | |||
} else { | |||
log.Error(3, "GetUserByID[%d]: %v", c.ID, err) | |||
} | |||
} | |||
case "created": | |||
c.Created = regulateTimeZone(c.Created) | |||
} | |||
} | |||
func (c *Comment) AfterDelete() { | |||
_, err := DeleteAttachmentsByComment(c.ID, true) | |||
if err != nil { | |||
log.Info("Could not delete files for comment %d on issue #%d: %s", c.ID, c.IssueID, err) | |||
} | |||
} | |||
// HashTag returns unique hash tag for comment. | |||
func (c *Comment) HashTag() string { | |||
return "issuecomment-" + com.ToStr(c.ID) | |||
} | |||
// EventTag returns unique event hash tag for comment. | |||
func (c *Comment) EventTag() string { | |||
return "event-" + com.ToStr(c.ID) | |||
} | |||
func createComment(e *xorm.Session, u *User, repo *Repository, issue *Issue, commitID, line int64, cmtType CommentType, content, commitSHA string, uuids []string) (_ *Comment, err error) { | |||
comment := &Comment{ | |||
PosterID: u.Id, | |||
Type: cmtType, | |||
IssueID: issue.ID, | |||
CommitID: commitID, | |||
Line: line, | |||
Content: content, | |||
CommitSHA: commitSHA, | |||
} | |||
if _, err = e.Insert(comment); err != nil { | |||
return nil, err | |||
} | |||
// Compose comment action, could be plain comment, close or reopen issue. | |||
// This object will be used to notify watchers in the end of function. | |||
act := &Action{ | |||
ActUserID: u.Id, | |||
ActUserName: u.Name, | |||
ActEmail: u.Email, | |||
Content: fmt.Sprintf("%d|%s", issue.Index, strings.Split(content, "\n")[0]), | |||
RepoID: repo.ID, | |||
RepoUserName: repo.Owner.Name, | |||
RepoName: repo.Name, | |||
IsPrivate: repo.IsPrivate, | |||
} | |||
// Check comment type. | |||
switch cmtType { | |||
case COMMENT_TYPE_COMMENT: | |||
act.OpType = ACTION_COMMENT_ISSUE | |||
if _, err = e.Exec("UPDATE `issue` SET num_comments=num_comments+1 WHERE id=?", issue.ID); err != nil { | |||
return nil, err | |||
} | |||
// Check attachments. | |||
attachments := make([]*Attachment, 0, len(uuids)) | |||
for _, uuid := range uuids { | |||
attach, err := getAttachmentByUUID(e, uuid) | |||
if err != nil { | |||
if IsErrAttachmentNotExist(err) { | |||
continue | |||
} | |||
return nil, fmt.Errorf("getAttachmentByUUID[%s]: %v", uuid, err) | |||
} | |||
attachments = append(attachments, attach) | |||
} | |||
for i := range attachments { | |||
attachments[i].IssueID = issue.ID | |||
attachments[i].CommentID = comment.ID | |||
// No assign value could be 0, so ignore AllCols(). | |||
if _, err = e.Id(attachments[i].ID).Update(attachments[i]); err != nil { | |||
return nil, fmt.Errorf("update attachment[%d]: %v", attachments[i].ID, err) | |||
} | |||
} | |||
case COMMENT_TYPE_REOPEN: | |||
act.OpType = ACTION_REOPEN_ISSUE | |||
if issue.IsPull { | |||
_, err = e.Exec("UPDATE `repository` SET num_closed_pulls=num_closed_pulls-1 WHERE id=?", repo.ID) | |||
} else { | |||
_, err = e.Exec("UPDATE `repository` SET num_closed_issues=num_closed_issues-1 WHERE id=?", repo.ID) | |||
} | |||
if err != nil { | |||
return nil, err | |||
} | |||
case COMMENT_TYPE_CLOSE: | |||
act.OpType = ACTION_CLOSE_ISSUE | |||
if issue.IsPull { | |||
_, err = e.Exec("UPDATE `repository` SET num_closed_pulls=num_closed_pulls+1 WHERE id=?", repo.ID) | |||
} else { | |||
_, err = e.Exec("UPDATE `repository` SET num_closed_issues=num_closed_issues+1 WHERE id=?", repo.ID) | |||
} | |||
if err != nil { | |||
return nil, err | |||
} | |||
} | |||
// Notify watchers for whatever action comes in. | |||
if err = notifyWatchers(e, act); err != nil { | |||
return nil, fmt.Errorf("notifyWatchers: %v", err) | |||
} | |||
return comment, nil | |||
} | |||
func createStatusComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue) (*Comment, error) { | |||
cmtType := COMMENT_TYPE_CLOSE | |||
if !issue.IsClosed { | |||
cmtType = COMMENT_TYPE_REOPEN | |||
} | |||
return createComment(e, doer, repo, issue, 0, 0, cmtType, "", "", nil) | |||
} | |||
// CreateComment creates comment of issue or commit. | |||
func CreateComment(doer *User, repo *Repository, issue *Issue, commitID, line int64, cmtType CommentType, content, commitSHA string, attachments []string) (comment *Comment, err error) { | |||
sess := x.NewSession() | |||
defer sessionRelease(sess) | |||
if err = sess.Begin(); err != nil { | |||
return nil, err | |||
} | |||
comment, err = createComment(sess, doer, repo, issue, commitID, line, cmtType, content, commitSHA, attachments) | |||
if err != nil { | |||
return nil, err | |||
} | |||
return comment, sess.Commit() | |||
} | |||
// CreateIssueComment creates a plain issue comment. | |||
func CreateIssueComment(doer *User, repo *Repository, issue *Issue, content string, attachments []string) (*Comment, error) { | |||
return CreateComment(doer, repo, issue, 0, 0, COMMENT_TYPE_COMMENT, content, "", attachments) | |||
} | |||
// CreateRefComment creates a commit reference comment to issue. | |||
func CreateRefComment(doer *User, repo *Repository, issue *Issue, content, commitSHA string) error { | |||
if len(commitSHA) == 0 { | |||
return fmt.Errorf("cannot create reference with empty commit SHA") | |||
} | |||
// Check if same reference from same commit has already existed. | |||
has, err := x.Get(&Comment{ | |||
Type: COMMENT_TYPE_COMMIT_REF, | |||
IssueID: issue.ID, | |||
CommitSHA: commitSHA, | |||
}) | |||
if err != nil { | |||
return fmt.Errorf("check reference comment: %v", err) | |||
} else if has { | |||
return nil | |||
} | |||
_, err = CreateComment(doer, repo, issue, 0, 0, COMMENT_TYPE_COMMIT_REF, content, commitSHA, nil) | |||
return err | |||
} | |||
// GetCommentByID returns the comment by given ID. | |||
func GetCommentByID(id int64) (*Comment, error) { | |||
c := new(Comment) | |||
has, err := x.Id(id).Get(c) | |||
if err != nil { | |||
return nil, err | |||
} else if !has { | |||
return nil, ErrCommentNotExist{id} | |||
} | |||
return c, nil | |||
} | |||
// GetCommentsByIssueID returns all comments of issue by given ID. | |||
func GetCommentsByIssueID(issueID int64) ([]*Comment, error) { | |||
comments := make([]*Comment, 0, 10) | |||
return comments, x.Where("issue_id=?", issueID).Asc("created").Find(&comments) | |||
} | |||
// UpdateComment updates information of comment. | |||
func UpdateComment(c *Comment) error { | |||
_, err := x.Id(c.ID).AllCols().Update(c) | |||
return err | |||
} | |||
// Attachment represent a attachment of issue/comment/release. | |||
type Attachment struct { | |||
ID int64 `xorm:"pk autoincr"` |
@@ -0,0 +1,311 @@ | |||
// Copyright 2016 The Gogs Authors. All rights reserved. | |||
// Use of this source code is governed by a MIT-style | |||
// license that can be found in the LICENSE file. | |||
package models | |||
import ( | |||
"fmt" | |||
"strings" | |||
"time" | |||
"github.com/Unknwon/com" | |||
"github.com/go-xorm/xorm" | |||
"github.com/gogits/gogs/modules/log" | |||
) | |||
// CommentType defines whether a comment is just a simple comment, an action (like close) or a reference. | |||
type CommentType int | |||
const ( | |||
// Plain comment, can be associated with a commit (CommitID > 0) and a line (LineNum > 0) | |||
COMMENT_TYPE_COMMENT CommentType = iota | |||
COMMENT_TYPE_REOPEN | |||
COMMENT_TYPE_CLOSE | |||
// References. | |||
COMMENT_TYPE_ISSUE_REF | |||
// Reference from a commit (not part of a pull request) | |||
COMMENT_TYPE_COMMIT_REF | |||
// Reference from a comment | |||
COMMENT_TYPE_COMMENT_REF | |||
// Reference from a pull request | |||
COMMENT_TYPE_PULL_REF | |||
) | |||
type CommentTag int | |||
const ( | |||
COMMENT_TAG_NONE CommentTag = iota | |||
COMMENT_TAG_POSTER | |||
COMMENT_TAG_ADMIN | |||
COMMENT_TAG_OWNER | |||
) | |||
// Comment represents a comment in commit and issue page. | |||
type Comment struct { | |||
ID int64 `xorm:"pk autoincr"` | |||
Type CommentType | |||
PosterID int64 | |||
Poster *User `xorm:"-"` | |||
IssueID int64 `xorm:"INDEX"` | |||
CommitID int64 | |||
Line int64 | |||
Content string `xorm:"TEXT"` | |||
RenderedContent string `xorm:"-"` | |||
Created time.Time `xorm:"CREATED"` | |||
// Reference issue in commit message | |||
CommitSHA string `xorm:"VARCHAR(40)"` | |||
Attachments []*Attachment `xorm:"-"` | |||
// For view issue page. | |||
ShowTag CommentTag `xorm:"-"` | |||
} | |||
func (c *Comment) AfterSet(colName string, _ xorm.Cell) { | |||
var err error | |||
switch colName { | |||
case "id": | |||
c.Attachments, err = GetAttachmentsByCommentID(c.ID) | |||
if err != nil { | |||
log.Error(3, "GetAttachmentsByCommentID[%d]: %v", c.ID, err) | |||
} | |||
case "poster_id": | |||
c.Poster, err = GetUserByID(c.PosterID) | |||
if err != nil { | |||
if IsErrUserNotExist(err) { | |||
c.PosterID = -1 | |||
c.Poster = NewFakeUser() | |||
} else { | |||
log.Error(3, "GetUserByID[%d]: %v", c.ID, err) | |||
} | |||
} | |||
case "created": | |||
c.Created = regulateTimeZone(c.Created) | |||
} | |||
} | |||
func (c *Comment) AfterDelete() { | |||
_, err := DeleteAttachmentsByComment(c.ID, true) | |||
if err != nil { | |||
log.Info("Could not delete files for comment %d on issue #%d: %s", c.ID, c.IssueID, err) | |||
} | |||
} | |||
// HashTag returns unique hash tag for comment. | |||
func (c *Comment) HashTag() string { | |||
return "issuecomment-" + com.ToStr(c.ID) | |||
} | |||
// EventTag returns unique event hash tag for comment. | |||
func (c *Comment) EventTag() string { | |||
return "event-" + com.ToStr(c.ID) | |||
} | |||
func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err error) { | |||
comment := &Comment{ | |||
Type: opts.Type, | |||
PosterID: opts.Doer.Id, | |||
IssueID: opts.Issue.ID, | |||
CommitID: opts.CommitID, | |||
CommitSHA: opts.CommitSHA, | |||
Line: opts.LineNum, | |||
Content: opts.Content, | |||
} | |||
if _, err = e.Insert(comment); err != nil { | |||
return nil, err | |||
} | |||
// Compose comment action, could be plain comment, close or reopen issue. | |||
// This object will be used to notify watchers in the end of function. | |||
act := &Action{ | |||
ActUserID: opts.Doer.Id, | |||
ActUserName: opts.Doer.Name, | |||
ActEmail: opts.Doer.Email, | |||
Content: fmt.Sprintf("%d|%s", opts.Issue.Index, strings.Split(opts.Content, "\n")[0]), | |||
RepoID: opts.Repo.ID, | |||
RepoUserName: opts.Repo.Owner.Name, | |||
RepoName: opts.Repo.Name, | |||
IsPrivate: opts.Repo.IsPrivate, | |||
} | |||
// Check comment type. | |||
switch opts.Type { | |||
case COMMENT_TYPE_COMMENT: | |||
act.OpType = ACTION_COMMENT_ISSUE | |||
if _, err = e.Exec("UPDATE `issue` SET num_comments=num_comments+1 WHERE id=?", opts.Issue.ID); err != nil { | |||
return nil, err | |||
} | |||
// Check attachments | |||
attachments := make([]*Attachment, 0, len(opts.Attachments)) | |||
for _, uuid := range opts.Attachments { | |||
attach, err := getAttachmentByUUID(e, uuid) | |||
if err != nil { | |||
if IsErrAttachmentNotExist(err) { | |||
continue | |||
} | |||
return nil, fmt.Errorf("getAttachmentByUUID[%s]: %v", uuid, err) | |||
} | |||
attachments = append(attachments, attach) | |||
} | |||
for i := range attachments { | |||
attachments[i].IssueID = opts.Issue.ID | |||
attachments[i].CommentID = comment.ID | |||
// No assign value could be 0, so ignore AllCols(). | |||
if _, err = e.Id(attachments[i].ID).Update(attachments[i]); err != nil { | |||
return nil, fmt.Errorf("update attachment[%d]: %v", attachments[i].ID, err) | |||
} | |||
} | |||
case COMMENT_TYPE_REOPEN: | |||
act.OpType = ACTION_REOPEN_ISSUE | |||
if opts.Issue.IsPull { | |||
act.OpType = ACTION_REOPEN_PULL_REQUEST | |||
} | |||
if opts.Issue.IsPull { | |||
_, err = e.Exec("UPDATE `repository` SET num_closed_pulls=num_closed_pulls-1 WHERE id=?", opts.Repo.ID) | |||
} else { | |||
_, err = e.Exec("UPDATE `repository` SET num_closed_issues=num_closed_issues-1 WHERE id=?", opts.Repo.ID) | |||
} | |||
if err != nil { | |||
return nil, err | |||
} | |||
case COMMENT_TYPE_CLOSE: | |||
act.OpType = ACTION_CLOSE_ISSUE | |||
if opts.Issue.IsPull { | |||
act.OpType = ACTION_CLOSE_PULL_REQUEST | |||
} | |||
if opts.Issue.IsPull { | |||
_, err = e.Exec("UPDATE `repository` SET num_closed_pulls=num_closed_pulls+1 WHERE id=?", opts.Repo.ID) | |||
} else { | |||
_, err = e.Exec("UPDATE `repository` SET num_closed_issues=num_closed_issues+1 WHERE id=?", opts.Repo.ID) | |||
} | |||
if err != nil { | |||
return nil, err | |||
} | |||
} | |||
// Notify watchers for whatever action comes in | |||
if err = notifyWatchers(e, act); err != nil { | |||
return nil, fmt.Errorf("notifyWatchers: %v", err) | |||
} | |||
return comment, nil | |||
} | |||
func createStatusComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue) (*Comment, error) { | |||
cmtType := COMMENT_TYPE_CLOSE | |||
if !issue.IsClosed { | |||
cmtType = COMMENT_TYPE_REOPEN | |||
} | |||
return createComment(e, &CreateCommentOptions{ | |||
Type: cmtType, | |||
Doer: doer, | |||
Repo: repo, | |||
Issue: issue, | |||
}) | |||
} | |||
type CreateCommentOptions struct { | |||
Type CommentType | |||
Doer *User | |||
Repo *Repository | |||
Issue *Issue | |||
CommitID int64 | |||
CommitSHA string | |||
LineNum int64 | |||
Content string | |||
Attachments []string // UUIDs of attachments | |||
} | |||
// CreateComment creates comment of issue or commit. | |||
func CreateComment(opts *CreateCommentOptions) (comment *Comment, err error) { | |||
sess := x.NewSession() | |||
defer sessionRelease(sess) | |||
if err = sess.Begin(); err != nil { | |||
return nil, err | |||
} | |||
comment, err = createComment(sess, opts) | |||
if err != nil { | |||
return nil, err | |||
} | |||
return comment, sess.Commit() | |||
} | |||
// CreateIssueComment creates a plain issue comment. | |||
func CreateIssueComment(doer *User, repo *Repository, issue *Issue, content string, attachments []string) (*Comment, error) { | |||
return CreateComment(&CreateCommentOptions{ | |||
Type: COMMENT_TYPE_COMMENT, | |||
Doer: doer, | |||
Repo: repo, | |||
Issue: issue, | |||
Content: content, | |||
Attachments: attachments, | |||
}) | |||
} | |||
// CreateRefComment creates a commit reference comment to issue. | |||
func CreateRefComment(doer *User, repo *Repository, issue *Issue, content, commitSHA string) error { | |||
if len(commitSHA) == 0 { | |||
return fmt.Errorf("cannot create reference with empty commit SHA") | |||
} | |||
// Check if same reference from same commit has already existed. | |||
has, err := x.Get(&Comment{ | |||
Type: COMMENT_TYPE_COMMIT_REF, | |||
IssueID: issue.ID, | |||
CommitSHA: commitSHA, | |||
}) | |||
if err != nil { | |||
return fmt.Errorf("check reference comment: %v", err) | |||
} else if has { | |||
return nil | |||
} | |||
_, err = CreateComment(&CreateCommentOptions{ | |||
Type: COMMENT_TYPE_COMMIT_REF, | |||
Doer: doer, | |||
Repo: repo, | |||
Issue: issue, | |||
CommitSHA: commitSHA, | |||
Content: content, | |||
}) | |||
return err | |||
} | |||
// GetCommentByID returns the comment by given ID. | |||
func GetCommentByID(id int64) (*Comment, error) { | |||
c := new(Comment) | |||
has, err := x.Id(id).Get(c) | |||
if err != nil { | |||
return nil, err | |||
} else if !has { | |||
return nil, ErrCommentNotExist{id} | |||
} | |||
return c, nil | |||
} | |||
// GetCommentsByIssueID returns all comments of issue by given ID. | |||
func GetCommentsByIssueID(issueID int64) ([]*Comment, error) { | |||
comments := make([]*Comment, 0, 10) | |||
return comments, x.Where("issue_id=?", issueID).Asc("created").Find(&comments) | |||
} | |||
// UpdateComment updates information of comment. | |||
func UpdateComment(c *Comment) error { | |||
_, err := x.Id(c.ID).AllCols().Update(c) | |||
return err | |||
} |
@@ -233,7 +233,7 @@ func ActionIcon(opType int) string { | |||
return "repo" | |||
case 5, 9: // Commit repository | |||
return "git-commit" | |||
case 6, 13: // Create and reopen issue | |||
case 6: // Create issue | |||
return "issue-opened" | |||
case 7: // New pull request | |||
return "git-pull-request" | |||
@@ -241,8 +241,10 @@ func ActionIcon(opType int) string { | |||
return "comment" | |||
case 11: // Merge pull request | |||
return "git-merge" | |||
case 12: // Close issue | |||
case 12, 14: // Close issue or pull request | |||
return "issue-closed" | |||
case 13, 15: // Reopen issue or pull request | |||
return "issue-reopened" | |||
default: | |||
return "invalid type" | |||
} |
@@ -1 +1 @@ | |||
0.8.57.0305 | |||
0.8.58.0305 |
@@ -37,6 +37,12 @@ | |||
{{else if eq .GetOpType 13}} | |||
{{ $index := index .GetIssueInfos 0}} | |||
{{$.i18n.Tr "action.reopen_issue" .GetRepoLink $index .ShortRepoPath | Str2html}} | |||
{{else if eq .GetOpType 14}} | |||
{{ $index := index .GetIssueInfos 0}} | |||
{{$.i18n.Tr "action.close_pull_request" .GetRepoLink $index .ShortRepoPath | Str2html}} | |||
{{else if eq .GetOpType 15}} | |||
{{ $index := index .GetIssueInfos 0}} | |||
{{$.i18n.Tr "action.reopen_pull_request" .GetRepoLink $index .ShortRepoPath | Str2html}} | |||
{{end}} | |||
</p> | |||
{{if eq .GetOpType 5}} | |||
@@ -55,13 +61,13 @@ | |||
{{else if eq .GetOpType 6}} | |||
<span class="text truncate issue title has-emoji">{{index .GetIssueInfos 1}}</span> | |||
{{else if eq .GetOpType 7}} | |||
<p class="text light grey has-emoji">{{index .GetIssueInfos 1}}</p> | |||
<span class="text truncate issue title has-emoji">{{index .GetIssueInfos 1}}</span> | |||
{{else if eq .GetOpType 10}} | |||
<span class="text truncate issue title has-emoji">{{.GetIssueTitle}}</span> | |||
<p class="text light grey has-emoji">{{index .GetIssueInfos 1}}</p> | |||
{{else if eq .GetOpType 11}} | |||
<p class="text light grey has-emoji">{{index .GetIssueInfos 1}}</p> | |||
{{else if (or (eq .GetOpType 12) (eq .GetOpType 13))}} | |||
{{else if (or (or (eq .GetOpType 12) (eq .GetOpType 13)) (or (eq .GetOpType 14) (eq .GetOpType 15)))}} | |||
<span class="text truncate issue title has-emoji">{{.GetIssueTitle}}</span> | |||
{{end}} | |||
<p class="text italic light grey">{{TimeSince .GetCreate $.i18n.Lang}}</p> |