Fix for #581. Column name and CSS is changed.

src/main/resources/update/2_7.sql

@@ -10,7 +10,7 @@ CREATE TABLE COMMIT_COMMENT (
     NEW_LINE_NUMBER INT,
     REGISTERED_DATE TIMESTAMP NOT NULL,
     UPDATED_DATE TIMESTAMP NOT NULL,
-    IS_IN_PR BOOLEAN NOT NULL
+    PULL_REQUEST BOOLEAN NOT NULL
 );
 
 ALTER TABLE COMMIT_COMMENT ADD CONSTRAINT IDX_COMMIT_COMMENT_PK PRIMARY KEY (COMMENT_ID);

src/main/scala/app/RepositoryViewerController.scala

@@ -57,7 +57,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     oldLineNumber: Option[Int],
     newLineNumber: Option[Int],
     content: String,
-    isInPR: Boolean
+    pullRequest: Boolean
   )
 
   val editorForm = mapping(
@@ -79,11 +79,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   )(DeleteForm.apply)
 
   val commentForm = mapping(
-    "fileName" -> trim(label("Filename", optional(text()))),
+    "fileName"      -> trim(label("Filename", optional(text()))),
     "oldLineNumber" -> trim(label("Old line number", optional(number()))),
     "newLineNumber" -> trim(label("New line number", optional(number()))),
-    "content" -> trim(label("Content", text(required))),
-    "isInPR" -> trim(label("Is in PR", boolean()))
+    "content"       -> trim(label("Content", text(required))),
+    "pullRequest"   -> trim(label("In pull request", boolean()))
   )(CommentForm.apply)
 
   /**
@@ -247,20 +247,20 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   post("/:owner/:repository/commit/:id/comment/new", commentForm)(readableUsersOnly { (form, repository) =>
     val id = params("id")
     createCommitComment(repository.owner, repository.name, id, context.loginAccount.get.userName, form.content,
-      form.fileName, form.oldLineNumber, form.newLineNumber, form.isInPR)
+      form.fileName, form.oldLineNumber, form.newLineNumber, form.pullRequest)
     recordCommentCommitActivity(repository.owner, repository.name, context.loginAccount.get.userName, id, form.content)
     redirect(s"/${repository.owner}/${repository.name}/commit/${id}")
   })
 
   ajaxGet("/:owner/:repository/commit/:id/comment/_form")(readableUsersOnly { repository =>
-    val id = params("id")
-    val fileName = params.get("fileName")
+    val id            = params("id")
+    val fileName      = params.get("fileName")
     val oldLineNumber = params.get("oldLineNumber") flatMap {b => Some(b.toInt)}
     val newLineNumber = params.get("newLineNumber") flatMap {b => Some(b.toInt)}
-    val isInPR = params.get("isInPR")
+    val pullRequest   = params.get("pullRequest")
     repo.html.commentform(
       commitId = id,
-      fileName, oldLineNumber, newLineNumber, isInPR.map(_.toBoolean).getOrElse(false),
+      fileName, oldLineNumber, newLineNumber, pullRequest.map(_.toBoolean).getOrElse(false),
       hasWritePermission = hasWritePermission(repository.owner, repository.name, context.loginAccount),
       repository = repository
     )
@@ -269,7 +269,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   ajaxPost("/:owner/:repository/commit/:id/comment/_data/new", commentForm)(readableUsersOnly { (form, repository) =>
     val id = params("id")
     val commentId = createCommitComment(repository.owner, repository.name, id, context.loginAccount.get.userName,
-      form.content, form.fileName, form.oldLineNumber, form.newLineNumber, form.isInPR)
+      form.content, form.fileName, form.oldLineNumber, form.newLineNumber, form.pullRequest)
     recordCommentCommitActivity(repository.owner, repository.name, context.loginAccount.get.userName, id, form.content)
     helper.html.commitcomment(getCommitComment(repository.owner, repository.name, commentId.toString).get,
       hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)

src/main/scala/model/Comment.scala

@@ -55,8 +55,8 @@ trait CommitCommentComponent extends TemplateComponent { self: Profile =>
     val newLine = column[Option[Int]]("NEW_LINE_NUMBER")
     val registeredDate = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
-    val isInPR = column[Boolean]("IS_IN_PR")
-    def * = (userName, repositoryName, commitId, commentId, commentedUserName, content, fileName, oldLine, newLine, registeredDate, updatedDate, isInPR) <> (CommitComment.tupled, CommitComment.unapply)
+    val pullRequest = column[Boolean]("PULL_REQUEST")
+    def * = (userName, repositoryName, commitId, commentId, commentedUserName, content, fileName, oldLine, newLine, registeredDate, updatedDate, pullRequest) <> (CommitComment.tupled, CommitComment.unapply)
 
     def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
   }
@@ -74,5 +74,5 @@ case class CommitComment(
   newLine: Option[Int],
   registeredDate: java.util.Date,
   updatedDate: java.util.Date,
-  isInPR: Boolean
+  pullRequest: Boolean
  ) extends Comment

src/main/scala/service/CommitsService.scala

@@ -12,9 +12,9 @@ import util.StringUtil._
 
 trait CommitsService {
 
-  def getCommitComments(owner: String, repository: String, commitId: String, isInPR: Boolean)(implicit s: Session) =
+  def getCommitComments(owner: String, repository: String, commitId: String, pullRequest: Boolean)(implicit s: Session) =
     CommitComments filter {
-      t => t.byCommit(owner, repository, commitId) && (t.isInPR === isInPR || isInPR)
+      t => t.byCommit(owner, repository, commitId) && (t.pullRequest === pullRequest || pullRequest)
     } list
 
   def getCommitComment(owner: String, repository: String, commentId: String)(implicit s: Session) =
@@ -26,7 +26,7 @@ trait CommitsService {
       None
 
   def createCommitComment(owner: String, repository: String, commitId: String, loginUser: String,
-    content: String, fileName: Option[String], oldLine: Option[Int], newLine: Option[Int], isInPR: Boolean)(implicit s: Session): Int =
+    content: String, fileName: Option[String], oldLine: Option[Int], newLine: Option[Int], pullRequest: Boolean)(implicit s: Session): Int =
     CommitComments.autoInc insert CommitComment(
       userName          = owner,
       repositoryName    = repository,
@@ -38,7 +38,7 @@ trait CommitsService {
       newLine           = newLine,
       registeredDate    = currentDate,
       updatedDate       = currentDate,
-      isInPR            = isInPR)
+      pullRequest       = pullRequest)
 
   def updateCommitComment(commentId: Int, content: String)(implicit s: Session) =
     CommitComments

src/main/twirl/helper/commitcomment.scala.html

@@ -1,7 +1,7 @@
 @(comment: model.CommitComment,
-hasWritePermission: Boolean,
-repository: service.RepositoryService.RepositoryInfo,
-latestCommitId: Option[String] = None)(implicit context: app.Context)
+  hasWritePermission: Boolean,
+  repository: service.RepositoryService.RepositoryInfo,
+  latestCommitId: Option[String] = None)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 <div class="@if(comment.fileName.isDefined && (!latestCommitId.isDefined || latestCommitId.get == comment.commitId)){inline-comment}" @if(comment.fileName.isDefined){filename=@comment.fileName.get} @if(comment.newLine.isDefined){newline=@comment.newLine.get} @if(comment.oldLine.isDefined){oldline=@comment.oldLine.get}>
@@ -11,7 +11,7 @@ latestCommitId: Option[String] = None)(implicit context: app.Context)
       @user(comment.commentedUserName, styleClass="username strong")
         <span class="muted">
           commented
-          @if(comment.isInPR){
+          @if(comment.pullRequest){
             on this Pull Request
           }else{
             @if(comment.fileName.isDefined){

src/main/twirl/helper/diff.scala.html

@@ -1,11 +1,11 @@
 @(diffs: Seq[util.JGitUtil.DiffInfo],
- repository: service.RepositoryService.RepositoryInfo,
- newCommitId: Option[String],
- oldCommitId: Option[String],
- showIndex: Boolean,
- isInPR: Boolean,
- hasWritePermission: Boolean,
- showLineNotes: Boolean)(implicit context: app.Context)
+  repository: service.RepositoryService.RepositoryInfo,
+  newCommitId: Option[String],
+  oldCommitId: Option[String],
+  showIndex: Boolean,
+  pullRequest: Boolean,
+  hasWritePermission: Boolean,
+  showLineNotes: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
@@ -157,7 +157,7 @@ $(function(){
           fileName = $(this).closest('.table-bordered').attr('fileName'),
           oldLineNumber = $(this).closest('.newline').prev('.oldline').text(),
           newLineNumber = $(this).closest('.newline').clone().children().remove().end().text(),
-          url = '@url(repository)/commit/' + commitId + '/comment/_form?fileName=' + fileName + '&isInPR=@isInPR';
+          url = '@url(repository)/commit/' + commitId + '/comment/_form?fileName=' + fileName + '&pullRequest=@pullRequest';
           if (!isNaN(oldLineNumber) && oldLineNumber != null && oldLineNumber !== '') {
             url += ('&oldLineNumber=' + oldLineNumber)
           }

src/main/twirl/pulls/commits.scala.html

@@ -21,7 +21,7 @@
               @comments.get.flatMap @{
                 case comment: model.CommitComment => Some(comment)
                 case other => None
-              }.count(t => t.commitId == commit.id && !t.isInPR)
+              }.count(t => t.commitId == commit.id && !t.pullRequest)
             }</span>
           </td>
           <td style="width: 10%; text-align: right;">

src/main/twirl/repo/commentform.scala.html

@@ -2,7 +2,7 @@
   fileName: Option[String] = None,
   oldLineNumber: Option[Int] = None,
   newLineNumber: Option[Int] = None,
-  isInPR: Boolean,
+  pullRequest: Boolean,
   hasWritePermission: Boolean,
   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
@@ -29,7 +29,7 @@
         <input type="submit" class="btn btn-success" formaction="@url(repository)/commit/@commitId/comment/new" value="Comment on this commit"/>
       </div>
     }
-    <input type="hidden" name="isInPR" value="@isInPR">
+    <input type="hidden" name="pullRequest" value="@pullRequest">
     @if(fileName.isDefined){<input type="hidden" name="fileName" value="@fileName.get">}
     @if(oldLineNumber.isDefined){<input type="hidden" name="oldLineNumber" value="@oldLineNumber.get">}
     @if(newLineNumber.isDefined){<input type="hidden" name="newLineNumber" value="@newLineNumber.get">}

src/main/twirl/repo/commit.scala.html

@@ -90,7 +90,7 @@
     <div id="comment-list">
       @issues.html.commentlist(None, comments, hasWritePermission, repository, None)
     </div>
-    @commentform(commitId = commitId, isInPR = false, hasWritePermission = hasWritePermission, repository = repository)
+    @commentform(commitId = commitId, pullRequest = false, hasWritePermission = hasWritePermission, repository = repository)
   }
 }
 <script>

src/main/webapp/assets/common/css/gitbucket.css

@@ -964,7 +964,7 @@ table.diff thead {
 }
 
 table.inlinediff td.insert, table.inlinediff td.equal, table.inlinediff td.delete {
-    width: 100%;
+    width: 900px;
 }
 
 td.insert, td.equal, td.delete, td.empty {