Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-12-27 02:39:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Send diff data of a commented location to the server

Browse Source
This commit is contained in:
Naoki Takezoe
2018-04-26 20:50:01 +09:00
parent ddbc2e6a56
commit 2d1f08bc01
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View File

@@ -103,7 +103,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
oldLineNumber: Option[Int],
newLineNumber: Option[Int],
content: String,
issueId: Option[Int]
issueId: Option[Int],
diff: Option[String]
)
val uploadForm = mapping(
@@ -138,7 +139,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
"oldLineNumber" -> trim(label("Old line number", optional(number()))),
"newLineNumber" -> trim(label("New line number", optional(number()))),
"content" -> trim(label("Content", text(required))),
"issueId" -> trim(label("Issue Id", optional(number())))
"issueId" -> trim(label("Issue Id", optional(number()))),
"diff" -> optional(text())
)(CommentForm.apply)
/**
@@ -613,6 +615,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
form.newLineNumber,
form.issueId
)
println(form.diff) // TODO store diff into the database
val comment = getCommitComment(repository.owner, repository.name, commentId.toString).get
form.issueId match {
case Some(issueId) =>

36
src/main/twirl/gitbucket/core/repo/commentform.scala.html
View File

@@ -49,6 +49,15 @@
$($form.serializeArray()).each(function(i, v) {
param[v.name] = v.value;
});
@if(newLineNumber.isDefined){
var diff = getDiffData($('table[filename="@fileName"] table.diff tr:has(th.line-num.newline[line-number=@newLineNumber])'));
param['diff'] = JSON.stringify(diff);
} else if(oldLineNumber.isDefined){
var diff = getDiffData($('table[filename="@fileName"] table.diff tr:has(th.line-num.oldline[line-number=@oldLineNumber])'));
param['diff'] = JSON.stringify(diff);
}
$.ajax({
url: '@helpers.url(repository)/commit/@commitId/comment/_data/new',
type: 'POST',
@@ -96,7 +105,6 @@
});
function getInlineContainer() {
console.log(window.viewType);
if (window.viewType == 0) {
if(@newLineNumber.isDefined){
return $('<tr class="not-diff"><td colspan="2"></td><td colspan="2" class="comment-box-container"></td></tr>');
@@ -107,5 +115,31 @@
}
return $('<tr class="not-diff"><td colspan="3" class="comment-box-container"></td></tr>');
}
function getDiffData(tr){
var result = [];
var count = 0;
while(tr && count < 4){
var oldTh = tr.find('th.oldline');
var newTh = tr.find('th.newline');
if(!oldTh.attr('line-number') && !newTh.attr('line-number')){
break;
}
result.unshift({
'oldLine': oldTh.attr('line-number'),
'newLine': newTh.attr('line-number'),
'type': tr.has('td.insert') ? 'insert' : tr.has('td.delete') ? 'delete' : 'equal',
'text': tr.find('td>span').text()
})
tr = tr.prev('tr:has(th.line-num)');
count++;
}
return result;
}
</script>
}