From 6b3218dd43261263ebf71489dba0220b711d8601 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sun, 18 Dec 2016 10:21:54 +0900
Subject: [PATCH] (refs #1370)Update search interface

---
 .../core/controller/IndexController.scala     | 11 +++-------
 src/main/twirl/gitbucket/core/main.scala.html | 20 +++++--------------
 src/main/twirl/gitbucket/core/menu.scala.html |  1 +
 .../gitbucket/core/repo/files.scala.html      |  4 +++-
 .../core/search/repositories.scala.html       |  2 +-
 5 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/src/main/scala/gitbucket/core/controller/IndexController.scala b/src/main/scala/gitbucket/core/controller/IndexController.scala
index 9f4a950b0..6b4db67f2 100644
--- a/src/main/scala/gitbucket/core/controller/IndexController.scala
+++ b/src/main/scala/gitbucket/core/controller/IndexController.scala
@@ -130,14 +130,9 @@ trait IndexControllerBase extends ControllerBase {
     } getOrElse ""
   })
 
-  // TODO Move to RepositoryViwerController?
-  post("/search", searchForm){ form =>
-    redirect(s"/${form.owner}/${form.repository}/search?q=${StringUtil.urlEncode(form.query)}")
-  }
-
   // TODO Move to RepositoryViwerController?
   get("/:owner/:repository/search")(referrersOnly { repository =>
-    defining(params("q").trim, params.getOrElse("type", "code")){ case (query, target) =>
+    defining(params.getOrElse("q", "").trim, params.getOrElse("type", "code")){ case (query, target) =>
       val page = try {
         val i = params.getOrElse("page", "1").toInt
         if(i <= 0) 1 else i
@@ -161,8 +156,8 @@ trait IndexControllerBase extends ControllerBase {
     }
   })
 
-  get("/searchrepo"){
-    val query = params("query").trim.toLowerCase
+  get("/search"){
+    val query = params.getOrElse("query", "").trim.toLowerCase
     val visibleRepositories = getVisibleRepositories(context.loginAccount, None)
     val repositories = visibleRepositories.filter { repository =>
       repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html
index 1dd3150dc..9abc816e2 100644
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -53,21 +53,11 @@
               <span class="sr-only">Toggle navigation</span>
             </a>
           }
-          @repository.map { repository =>
-            <form id="search" action="@context.path/search" method="POST" class="pc navbar-form navbar-left" role="search">
-              <div class="form-group">
-                <input type="text" name="query" id="navbar-search-input" class="form-control" placeholder="Search this repository"/>
-                <input type="hidden" name="owner" value="@repository.owner"/>
-                <input type="hidden" name="repository" value="@repository.name"/>
-              </div>
-            </form>
-          }.getOrElse {
-            <form id="search" action="@context.path/searchrepo" method="GET" class="pc navbar-form navbar-left" role="search">
-              <div class="form-group">
-                <input type="text" name="query" id="navbar-search-input" class="form-control" placeholder="Search repository"/>
-              </div>
-            </form>
-          }
+          <form id="search" action="@context.path/search" method="GET" class="pc navbar-form navbar-left" role="search">
+            <div class="form-group">
+              <input type="text" name="query" id="navbar-search-input" class="form-control" placeholder="Search repository"/>
+            </div>
+          </form>
           <ul class="pc nav navbar-nav">
             @if(context.loginAccount.isDefined){
               <li><a href="@context.path/dashboard/pulls">Pull requests</a></li>
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index e75d7f81e..7186ab1e5 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -67,6 +67,7 @@
           <div class="head">
             @gitbucket.core.helper.html.repositoryicon(repository, true)
             <a href="@helpers.url(repository.owner)">@repository.owner</a> / <a href="@helpers.url(repository)" class="strong">@repository.name</a>
+            <a href="@helpers.url(repository)/search"><i class="octicon octicon-search"></i></a>
 
             @defining(repository.repository){ x =>
               @if(repository.repository.originRepositoryName.isDefined){
diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html
index 0978e58ea..3742bef7c 100644
--- a/src/main/twirl/gitbucket/core/repo/files.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/files.scala.html
@@ -86,7 +86,9 @@
           <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
         }
       }
-      <a href="@helpers.url(repository)/new/@helpers.encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default pc" title="Create a new file here" @if(!hasWritePermission){disabled}><i class="octicon octicon-plus"></i></a>
+      @if(hasWritePermission){
+        <a href="@helpers.url(repository)/new/@helpers.encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default pc" title="Create a new file here"><i class="octicon octicon-plus"></i></a>
+      }
     </div>
     <table class="table table-hover">
       @*
diff --git a/src/main/twirl/gitbucket/core/search/repositories.scala.html b/src/main/twirl/gitbucket/core/search/repositories.scala.html
index 53cd185bc..f2b34b780 100644
--- a/src/main/twirl/gitbucket/core/search/repositories.scala.html
+++ b/src/main/twirl/gitbucket/core/search/repositories.scala.html
@@ -5,7 +5,7 @@
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main("GitBucket"){
   @gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){
-    <form action="@context.path/searchrepo" method="GET" class="form-inline">
+    <form action="@context.path/search" method="GET" class="form-inline">
       <input type="text" name="query" value="@query" class="form-control" style="width: 250px; margin-bottom: 0px;"/>
       <input type="submit" value="Search" class="btn btn-default"/>
     </form>