thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

More overlooks

Browse source
This commit is contained in:
Sandro Santilli 2016-11-07 17:35:34 +01:00
parent f14232d2e9
commit 64196d4036
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
models/issue_comment.go
View file

@ -25,16 +25,16 @@ const (
// Plain comment, can be associated with a commit (CommitID > 0) and a line (LineNum > 0) // Plain comment, can be associated with a commit (CommitID > 0) and a line (LineNum > 0)
CommentTypeComment CommentType = iota CommentTypeComment CommentType = iota
CommentTypeReopen CommentTypeReopen
COMMENT_TYPE_CLOSE CommentTypeClose
// References. // References.
COMMENT_TYPE_ISSUE_REF CommentTypeIssueRef
// Reference from a commit (not part of a pull request) // Reference from a commit (not part of a pull request)
COMMENT_TYPE_COMMIT_REF CommentTypeCommitRef
// Reference from a comment // Reference from a comment
CommentTypeComment_REF CommentTypeComment_REF
// Reference from a pull request // Reference from a pull request
COMMENT_TYPE_PULL_REF CommentTypePullRef
) )
type CommentTag int type CommentTag int
@ -43,7 +43,7 @@ const (
CommentTagNone CommentTag = iota CommentTagNone CommentTag = iota
CommentTagPoster CommentTagPoster
CommentTagWriter CommentTagWriter
COMMENT_TAG_OWNER CommentTagOwner
) )
// Comment represents a comment in commit and issue page. // Comment represents a comment in commit and issue page.
@ -231,7 +231,7 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err
return nil, err return nil, err
} }
case COMMENT_TYPE_CLOSE: case CommentTypeClose:
act.OpType = ActionCloseIssue act.OpType = ActionCloseIssue
if opts.Issue.IsPull { if opts.Issue.IsPull {
act.OpType = ActionClosePullRequest act.OpType = ActionClosePullRequest
@ -260,7 +260,7 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err
} }
func createStatusComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue) (*Comment, error) { func createStatusComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue) (*Comment, error) {
cmtType := COMMENT_TYPE_CLOSE cmtType := CommentTypeClose
if !issue.IsClosed { if !issue.IsClosed {
cmtType = CommentTypeReopen cmtType = CommentTypeReopen
} }
@ -321,7 +321,7 @@ func CreateRefComment(doer *User, repo *Repository, issue *Issue, content, commi
// Check if same reference from same commit has already existed. // Check if same reference from same commit has already existed.
has, err := x.Get(&Comment{ has, err := x.Get(&Comment{
Type: COMMENT_TYPE_COMMIT_REF, Type: CommentTypeCommitRef,
IssueID: issue.ID, IssueID: issue.ID,
CommitSHA: commitSHA, CommitSHA: commitSHA,
}) })
@ -332,7 +332,7 @@ func CreateRefComment(doer *User, repo *Repository, issue *Issue, content, commi
} }
_, err = CreateComment(&CreateCommentOptions{ _, err = CreateComment(&CreateCommentOptions{
Type: COMMENT_TYPE_COMMIT_REF, Type: CommentTypeCommitRef,
Doer: doer, Doer: doer,
Repo: repo, Repo: repo,
Issue: issue, Issue: issue,

2
routers/repo/issue.go
View file

@ -612,7 +612,7 @@ func ViewIssue(ctx *context.Context) {
if repo.IsOwnedBy(comment.PosterID) || if repo.IsOwnedBy(comment.PosterID) ||
(repo.Owner.IsOrganization() && repo.Owner.IsOwnedBy(comment.PosterID)) { (repo.Owner.IsOrganization() && repo.Owner.IsOwnedBy(comment.PosterID)) {
comment.ShowTag = models.COMMENT_TAG_OWNER comment.ShowTag = models.CommentTagOwner
} else if comment.Poster.IsWriterOfRepo(repo) { } else if comment.Poster.IsWriterOfRepo(repo) {
comment.ShowTag = models.CommentTagWriter comment.ShowTag = models.CommentTagWriter
} else if comment.PosterID == issue.PosterID { } else if comment.PosterID == issue.PosterID {