mirror of https://github.com/go-gitea/gitea.git
Merge a65f0f6970
into 24ce2058e8
commit
85a2ec0965
|
@ -130,7 +130,7 @@ func (d *DiffLine) GetHTMLDiffLineType() string {
|
||||||
|
|
||||||
// CanComment returns whether a line can get commented
|
// CanComment returns whether a line can get commented
|
||||||
func (d *DiffLine) CanComment() bool {
|
func (d *DiffLine) CanComment() bool {
|
||||||
return len(d.Comments) == 0 && d.Type != DiffLineSection
|
return len(d.Comments) == 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetCommentSide returns the comment side of the first comment, if not set returns empty string
|
// GetCommentSide returns the comment side of the first comment, if not set returns empty string
|
||||||
|
|
|
@ -586,7 +586,7 @@ func TestDiff_LoadCommentsWithOutdated(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDiffLine_CanComment(t *testing.T) {
|
func TestDiffLine_CanComment(t *testing.T) {
|
||||||
assert.False(t, (&DiffLine{Type: DiffLineSection}).CanComment())
|
assert.True(t, (&DiffLine{Type: DiffLineSection}).CanComment())
|
||||||
assert.False(t, (&DiffLine{Type: DiffLineAdd, Comments: []*issues_model.Comment{{Content: "bla"}}}).CanComment())
|
assert.False(t, (&DiffLine{Type: DiffLineAdd, Comments: []*issues_model.Comment{{Content: "bla"}}}).CanComment())
|
||||||
assert.True(t, (&DiffLine{Type: DiffLineAdd}).CanComment())
|
assert.True(t, (&DiffLine{Type: DiffLineAdd}).CanComment())
|
||||||
assert.True(t, (&DiffLine{Type: DiffLineDel}).CanComment())
|
assert.True(t, (&DiffLine{Type: DiffLineDel}).CanComment())
|
||||||
|
|
Loading…
Reference in New Issue