Merge branch 'master' of https://github.com/takezoe/gitbucket

src/main/scala/app/IssuesController.scala

@@ -66,11 +66,13 @@ trait IssuesControllerBase extends ControllerBase {
   post("/:owner/:repository/issue_comments")( usersOnly {
     val owner = params("owner")
     val repository = params("repository")
-    val issueId = params("issueId")
+    val issueId = params("issueId").toInt
-    val content = params("content")
+    val content = params("content")	// TODO input check
 
-    // TODO Returns JSON
+    saveComment(owner, repository, context.loginAccount.get.userName, issueId, content)
-    redirect("/%s/%s/issues/%d".format(owner, repository, 1))
+
+    contentType = formats("json")
+    org.json4s.jackson.Serialization.write(Map("content" -> content))
   })
 
 }

src/main/scala/service/IssuesService.scala

@@ -51,4 +51,15 @@ trait IssuesService {
       }.map(_.issueId).update(id) > 0
     } get
 
+  def saveComment(owner: String, repository: String, loginUser: String,
+      issueId: Int, content: String) =
+    IssueComments.autoInc insert (
+        owner,
+        repository,
+        issueId,
+        loginUser,
+        content,
+        currentDate,
+        currentDate)
+
 }

src/main/twirl/issues/issue.scala.html

@@ -19,15 +19,13 @@
           @markdown(issue.content getOrElse "No description given.", repository, false, true, true)
         </div>
       </div>
-      <form action="@path/@repository.owner/@repository.name/issue_comments" method="POST">
+      <span id="comment-area"></span>
       <div class="box">
         <div class="box-content">
           @html.preview(repository, "", false, true, true, "width: 730px; height: 100px;")
         </div>
       </div>
-      <input type="hidden" name="issueId" value="@issue.issueId"/>
+      <input type="button" class="btn btn-success" value="Comment" id="comment"/>
-      <input type="submit" class="btn btn-success" value="Comment"/>
-      </form>
     </div>
     <div class="span2">
       @if(issue.closed) {
@@ -40,4 +38,18 @@
       <strong>Labels</strong>
     </div>
   </div>
-}
+}
+<script>
+$(function(){
+  $('#comment').click(function(){
+    $.post('@path/@repository.owner/@repository.name/issue_comments',
+    {
+      issueId : @issue.issueId,
+      content : $('#content').val()
+    },
+    function(data){
+      $('#comment-area').html(data.content);
+    });
+  });
+});
+</script>