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

fix #1198 remove @Required for docId

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-07-30 14:59:44 +09:00
parent 9fd61f252b
commit af80887a18
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
View file

@ -440,10 +440,13 @@ public class AdminSearchlistAction extends FessAdminAction {
case CrudMode.EDIT:
if (form instanceof EditForm) {
final String docId = ((EditForm) form).docId;
return fessEsClient.getDocument(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), builder -> {
builder.setQuery(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
return true;
});
if (StringUtil.isNotBlank(docId)) {
return fessEsClient.getDocument(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(),
builder -> {
builder.setQuery(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
return true;
});
}
}
break;
default:

1
src/main/java/org/codelibs/fess/app/web/admin/searchlist/EditForm.java
View file

@ -25,7 +25,6 @@ public class EditForm extends CreateForm {
public String id;
@Required
public String docId;
@ValidateTypeFailure