Fix Wiki page editing bug when over 100 pages (#2869)

src/main/scala/gitbucket/core/service/WikiService.scala

@@ -75,13 +75,15 @@ trait WikiService {
   def getWikiPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
     Using.resource(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
       if (!JGitUtil.isEmpty(git)) {
-        JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
+        val fileName = pageName + ".md"
+        JGitUtil.getLatestCommitFromPath(git, fileName, "master").map { latestCommit =>
+          val content = JGitUtil.getContentFromPath(git, latestCommit.getTree, fileName, true)
           WikiPageInfo(
-            file.name,
-            StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes),
-            file.author,
-            file.time,
-            file.commitId
+            fileName,
+            StringUtil.convertFromByteArray(content.getOrElse(Array.empty)),
+            latestCommit.getAuthorIdent.getName,
+            latestCommit.getAuthorIdent.getWhen,
+            latestCommit.getName
           )
         }
       } else None

src/main/scala/gitbucket/core/util/JGitUtil.scala

@@ -382,7 +382,7 @@ object JGitUtil {
     path: String = ".",
     baseUrl: Option[String] = None,
     commitCount: Int = 0,
-    maxFiles: Int = 100
+    maxFiles: Int = 5
   ): List[FileInfo] = {
     Using.resource(new RevWalk(git.getRepository)) { revWalk =>
       val objectId = git.getRepository.resolve(revision)
@@ -658,9 +658,13 @@ object JGitUtil {
    */
   def getLatestCommitFromPaths(git: Git, paths: List[String], revision: String): Map[String, RevCommit] = {
     val start = getRevCommitFromId(git, git.getRepository.resolve(revision))
-    paths.map { path =>
+    paths.flatMap { path =>
       val commit = git.log.add(start).addPath(path).setMaxCount(1).call.iterator.next
-      (path, commit)
+      if (commit == null) {
+        None
+      } else {
+        Some((path, commit))
+      }
     }.toMap
   }
 

src/main/twirl/gitbucket/core/wiki/compare.scala.html

@@ -9,32 +9,22 @@
 @gitbucket.core.html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){
   @gitbucket.core.helper.html.information(info)
   @gitbucket.core.html.menu("wiki", repository){
-    <ul class="nav nav-tabs fill-width">
-      <li>
-        <h1 class="wiki-title"><span class="muted">Compare Revisions</span></h1>
-      </li>
-      <li class="pull-right">
-        <div class="btn-group">
-        @if(pageName.isDefined){
-          <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)">View Page</a>
-          <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Back to Page History</a>
+    <div class="pull-right">
+      @if(pageName.isDefined){
+        <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)">View Page</a>
+        <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Back to Page History</a>
+      } else {
+        <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/_history">Back to Wiki History</a>
+      }
+      @if(isEditable) {
+        @if(pageName.isDefined) {
+          <a href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_revert/@from...@to" class="btn btn-danger">Revert Changes</a>
         } else {
-          <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/_history">Back to Wiki History</a>
+          <a href="@helpers.url(repository)/wiki/_revert/@from...@to" class="btn btn-danger">Revert Changes</a>
         }
-        </div>
-      </li>
-    </ul>
-    <div class="pull-left">
-      @gitbucket.core.helper.html.diff(diffs, repository, None, None, false, None, false, false)
+      }
     </div>
-    @if(isEditable){
-      <div>
-        @if(pageName.isDefined){
-          <a href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_revert/@from...@to" class="btn">Revert Changes</a>
-        } else {
-          <a href="@helpers.url(repository)/wiki/_revert/@from...@to" class="btn">Revert Changes</a>
-        }
-      </div>
-    }
+    <h1 class="body-title"><span class="muted">Compare Revisions</span></h1>
+    @gitbucket.core.helper.html.diff(diffs, repository, None, None, false, None, false, false)
   }
 }

src/main/twirl/gitbucket/core/wiki/edit.scala.html

@@ -11,7 +11,7 @@
         <a class="btn btn-danger" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_delete" id="delete">Delete Page</a>
       }
     </div>
-    <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
+    <h1 class="body-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
     <form action="@helpers.url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true" autocomplete="off">
       <span id="error-pageName" class="error"></span>
       <input type="text" name="pageName" value="@pageName" class="form-control" style="font-weight: bold; margin-bottom: 10px;" placeholder="Input a page name." aria-label="Page name"/>

src/main/twirl/gitbucket/core/wiki/history.scala.html

@@ -15,7 +15,7 @@
         }
       </div>
     }
-    <h1 class="wiki-title">
+    <h1 class="body-title">
     @if(pageName.isEmpty){
       <span class="muted">History</span>
     } else {

src/main/twirl/gitbucket/core/wiki/pages.scala.html

@@ -4,20 +4,17 @@
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){
   @gitbucket.core.html.menu("wiki", repository){
-    <ul class="nav nav-tabs fill-width">
-      <li>
-        <h1 class="wiki-title"><span class="muted">Pages</span></h1>
-      </li>
-      <li class="pull-right">
-        @if(isEditable){
-          <a class="btn btn-default" href="@helpers.url(repository)/wiki/_new">New Page</a>
-        }
-      </li>
-    </ul>
-    <ul class="pull-left">
+    <div class="pull-right">
+      @if(isEditable){
+        <a class="btn btn-default" href="@helpers.url(repository)/wiki/_new">New Page</a>
+      }
+    </div>
+    <h1 class="body-title"><span class="muted">Pages</span></h1>
+    <hr>
+    <ul>
       @pages.map { page =>
         <li><a href="@helpers.url(repository)/wiki/@helpers.urlEncode(page)">@page</a></li>
       }
     </ul>
   }
-}
+}