0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1535 add advance button

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-03-03 22:50:13 +09:00
parent 05313622fa
commit c1b46af153
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/app/web/search/SearchAction.java
View file

@ -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();

2
src/main/webapp/WEB-INF/view/header.jsp
View file

@ -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
src/main/webapp/WEB-INF/view/index.jsp
View file

@ -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">