peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix preview

Browse Source 
Beginn with new review comment patch system

Signed-off-by: Jonas Franz <info@jonasfranz.software>
This commit is contained in:
Jonas Franz 2018-07-05 22:47:31 +02:00
parent b553556187
commit 73b325c5d8
No known key found for this signature in database
GPG Key ID: 506AEEBE80BEDECD
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
models/issue_comment.go
View File

@ -400,31 +400,6 @@ func (c *Comment) AsDiff() (*Diff, error) {
if len(diff.Files) == 0 { if len(diff.Files) == 0 {
return nil, fmt.Errorf("no file found for comment ID: %d", c.ID) return nil, fmt.Errorf("no file found for comment ID: %d", c.ID)
} }
// Limit to CODE_COMMENT_LINES lines around comment line
for _, sec := range diff.Files[0].Sections {
var searchedLineIdx int
for lineIdx, line := range sec.Lines {
if c.Line < 0 && int64(line.LeftIdx) == c.Line {
searchedLineIdx = lineIdx
break
}
if c.Line > 0 && int64(line.RightIdx) == c.Line {
searchedLineIdx = lineIdx
break
}
}
if searchedLineIdx >= setting.UI.CodeCommentLines-1 {
first := searchedLineIdx - setting.UI.CodeCommentLines + 1
last := searchedLineIdx + 1
sec.Lines = sec.Lines[first:last]
diff.Files[0].Sections = []*DiffSection{sec}
break
} else if searchedLineIdx > 0 {
sec.Lines = sec.Lines[:searchedLineIdx+1]
diff.Files[0].Sections = []*DiffSection{sec}
break
}
}
return diff, nil return diff, nil
} }
@ -777,7 +752,7 @@ func CreateCodeComment(doer *User, repo *Repository, issue *Issue, content, tree
return nil, err return nil, err
} }
patchBuf := new(bytes.Buffer) patchBuf := new(bytes.Buffer)
if err := GetRawDiffForFile(gitRepo.Path, pr.MergeBase, headCommitID, RawDiffPatch, treePath, patchBuf); err != nil { if err := GetRawDiffForFile(gitRepo.Path, pr.MergeBase, headCommitID, RawDiffNormal, treePath, patchBuf); err != nil {
return nil, err return nil, err
} }

5
public/js/index.js
View File

@ -834,7 +834,7 @@ function initPullRequestReview() {
if (commentCloud.length === 0) { if (commentCloud.length === 0) {
td.html(form); td.html(form);
commentCloud = td.find('.comment-code-cloud'); commentCloud = td.find('.comment-code-cloud');
assingMenuAttributes(commentCloud.find('.menu')); var id = assingMenuAttributes(commentCloud.find('.menu'));
commentCloud.find('.tab.segment').each(function(i, item) { commentCloud.find('.tab.segment').each(function(i, item) {
$(item).attr('data-tab', $(item).attr('data-tab') + id); $(item).attr('data-tab', $(item).attr('data-tab') + id);
}); });
@ -853,7 +853,8 @@ function assingMenuAttributes(menu) {
menu.find('.item').each(function(i, item) { menu.find('.item').each(function(i, item) {
$(item).attr('data-tab', $(item).attr('data-tab') + id); $(item).attr('data-tab', $(item).attr('data-tab') + id);
}); });
initCommentPreviewTab(menu.parent(".form")) initCommentPreviewTab(menu.parent(".form"));
return id;
} }
function initRepositoryCollaboration() { function initRepositoryCollaboration() {