Browse Source

#1535 add advance button

Shinsuke Sugaya 7 years ago
parent
commit
c1b46af153

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/search/SearchAction.java

@@ -143,7 +143,7 @@ public class SearchAction extends FessSearchAction {
             }
         }
 
-        if (StringUtil.isBlank(form.q) && form.fields.isEmpty() && form.as.isEmpty()) {
+        if (StringUtil.isBlank(form.q) && form.fields.isEmpty() && !form.hasConditionQuery()) {
             // redirect to index page
             form.q = null;
             return redirectToRoot();

+ 1 - 1
src/main/webapp/WEB-INF/view/header.jsp

@@ -82,7 +82,7 @@
 					<i class="fa fa-search"></i>
 					<la:message key="labels.search" />
 				</button>
-				<la:link href="/search/advance?q=${f:u(q)}${fe:pagingQuery(null)}" styleClass="btn btn-primary">
+				<la:link href="/search/advance?q=${f:u(q)}${fe:pagingQuery(null)}" styleClass="btn btn-info">
 					<i class="fa fa-cog"></i>
 					<la:message key="labels.advance" />
 				</la:link>

+ 4 - 0
src/main/webapp/WEB-INF/view/index.jsp

@@ -133,6 +133,10 @@
 					<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
 						<la:message key="labels.search_options_clear" />
 					</button>
+					<la:link href="/search/advance" styleClass="btn btn-info">
+						<i class="fa fa-cog"></i>
+						<la:message key="labels.advance" />
+					</la:link>
 					<button type="button" class="btn btn-secondary pull-right"
 						data-toggle="control-options" data-target="#searchOptions"
 						id="searchOptionsCloseButton">