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

Merge pull request #624 from kw-udon/issue-592

Browse source 
#592 Pattern attribute in edit form
This commit is contained in:
Shinsuke Sugaya 2016-08-15 22:22:19 +09:00 • committed by GitHub
commit 66bc33c165
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
View file

@ -1101,16 +1101,14 @@ public interface FessProp {
public default List<String> invalidIndexDateFields(final Map<String, Object> source) {
return stream(getIndexAdminDateFields().split(",")).get(
stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim()).filter(s -> isNonEmptyValue(source.get(s)))
.filter(s -> !validateDateTimeString((String) source.get(s))).collect(Collectors.toList()));
.filter(s -> !validateDateTimeString(source.get(s))).collect(Collectors.toList()));
}
public default boolean validateDateTimeString(final String str) {
try {
FessFunctions.parseDate(str);
public default boolean validateDateTimeString(final Object obj) {
if (FessFunctions.parseDate(obj.toString()) != null) {
return true;
} catch (Exception e) {
return false;
}
return false;
}
String getIndexAdminIntegerFields();

28
src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
View file

@ -115,6 +115,7 @@
<div class="col-sm-9">
<la:errors property="doc.boost" />
<la:text property="doc.boost" styleClass="form-control"
pattern="\d+(\.\d*)?" title="Floating point number"
required="required" />
</div>
</div>
@ -245,7 +246,7 @@
<div class="col-sm-9">
<la:errors property="doc.content_length" />
<la:text property="doc.content_length"
styleClass="form-control" />
styleClass="form-control" pattern="\d+" title="Integer" />
</div>
</div>
<div class="form-group">
@ -267,43 +268,52 @@
<div class="col-sm-9">
<la:errors property="doc.favorite_count" />
<la:text property="doc.favorite_count"
styleClass="form-control" />
styleClass="form-control" pattern="\d+" title="Integer" />
</div>
</div>
<div class="form-group">
<label for="click_count" class="col-sm-3 control-label">click_count</label>
<div class="col-sm-9">
<la:errors property="doc.click_count" />
<la:text property="doc.click_count" styleClass="form-control" />
<la:text property="doc.click_count" styleClass="form-control"
pattern="\d+" title="Integer"/>
</div>
</div>
<div class="form-group">
<label for="created" class="col-sm-3 control-label">created</label>
<div class="col-sm-9">
<la:errors property="doc.created" />
<la:text property="doc.created" styleClass="form-control" />
</div>
<la:text property="doc.created" styleClass="form-control"
pattern="\d\d\d\d\-\d\d\-\d\dT\d\d\:\d\d\:\d\d\.\d\d\dZ"
title="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" />
</div>
</div>
<div class="form-group">
<label for="timestamp" class="col-sm-3 control-label">timestamp</label>
<div class="col-sm-9">
<la:errors property="doc.timestamp" />
<la:text property="doc.timestamp" styleClass="form-control" />
<la:text property="doc.timestamp" styleClass="form-control"
pattern="\d\d\d\d\-\d\d\-\d\dT\d\d\:\d\d\:\d\d\.\d\d\dZ"
title="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" />
</div>
</div>
<div class="form-group">
<label for="last_modified" class="col-sm-3 control-label">last_modified</label>
<div class="col-sm-9">
<la:errors property="doc.last_modified" />
<la:text property="doc.last_modified"
styleClass="form-control" />
<la:text property="doc.last_modified"
styleClass="form-control"
pattern="\d\d\d\d\-\d\d\-\d\dT\d\d\:\d\d\:\d\d\.\d\d\dZ"
title="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" />
</div>
</div>
<div class="form-group">
<label for="expires" class="col-sm-3 control-label">expires</label>
<div class="col-sm-9">
<la:errors property="doc.expires" />
<la:text property="doc.expires" styleClass="form-control" />
<la:text property="doc.expires" styleClass="form-control"
pattern="\d\d\d\d\-\d\d\-\d\dT\d\d\:\d\d\:\d\d\.\d\d\dZ"
title="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" />
</div>
</div>
</div>