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

fix failureurl search

Browse source
This commit is contained in:
Kaoru FUZITA 2015-11-09 19:32:28 +09:00
parent b6909eb7bd
commit 4b4fe4fdf9
4 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
View file

@ -99,7 +99,7 @@ public class AdminFailureurlAction extends FessAdminAction {
data.register("failureUrlItems", failureUrlService.getFailureUrlList(failureUrlPager)); // page navi
// restore from pager
copyBeanToBean(failureUrlPager, form, op -> op.include("id"));
copyBeanToBean(failureUrlPager, form, op -> op.include("url", "errorCountMin", "errorCountMax", "errorName"));
}
// -----------------------------------------------------

5
src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java
View file

@ -16,8 +16,6 @@
package org.codelibs.fess.app.web.admin.failureurl;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import javax.validation.constraints.Size;
@ -39,9 +37,6 @@ public class EditForm implements Serializable {
@ValidateTypeFailure
public String pageNumber;
// TODO remove?
public Map<String, String> searchParams = new HashMap<String, String>();
@ValidateTypeFailure
public Integer crudMode;

11
src/main/java/org/codelibs/fess/app/web/admin/failureurl/SearchForm.java
View file

@ -16,8 +16,6 @@
package org.codelibs.fess.app.web.admin.failureurl;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
/**
* @author codelibs
@ -27,7 +25,12 @@ public class SearchForm implements Serializable {
private static final long serialVersionUID = 1L;
public String id;
public String url;
public String errorCountMin;
public String errorCountMax;
public String errorName;
public Map<String, String> searchParams = new HashMap<String, String>();
}

16
src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp
View file

@ -41,33 +41,33 @@
</div>
<la:form styleClass="form-horizontal">
<div class="form-group">
<label for="searchParams.url" class="col-sm-2 control-label"><la:message
<label for="url" class="col-sm-2 control-label"><la:message
key="labels.failure_url_search_url" /></label>
<div class="col-sm-10">
<la:text property="searchParams.url"
<la:text property="url"
styleClass="form-control"></la:text>
</div>
</div>
<div class="form-group row">
<label for="searchParams.errorCountMin"
<label for="errorCountMin"
class="col-sm-2 control-label"><la:message
key="labels.failure_url_search_error_count" /></label>
<div class="col-xs-2">
<la:text property="searchParams.errorCountMin" size="2"
<la:text property="errorCountMin" size="2"
styleClass="form-control"></la:text>
</div>
<div class="pull-left">-</div>
<div class="col-xs-2">
<la:text property="searchParams.errorCountMax" size="2"
<la:text property="errorCountMax" size="2"
styleClass="form-control"></la:text>
</div>
</div>
<div class="form-group">
<label for="searchParams.errorName"
<label for="errorName"
class="col-sm-2 control-label"><la:message
key="labels.failure_url_search_error_name" /></label>
<div class="col-sm-10">
<la:text property="searchParams.errorName"
<la:text property="errorName"
styleClass="form-control"></la:text>
</div>
</div>
@ -78,7 +78,7 @@
<i class="fa fa-search"></i>
<la:message key="labels.crud_button_search" />
</button>
<button type="reset" class="btn btn-secondary" name="reset"
<button type="submit" class="btn btn-secondary" name="reset"
value="<la:message key="labels.crud_button_reset" />">
<la:message key="labels.crud_button_reset" />
</button>