diff --git a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java index 926852ec9..6266d1045 100644 --- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java +++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java @@ -63,6 +63,8 @@ import org.slf4j.LoggerFactory; public class SearchLogService { + private static final String YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm"; + private static final String COUNT = "count"; private static final String KEY = "key"; @@ -376,7 +378,7 @@ public class SearchLogService { } if (StringUtil.isNotBlank(pager.requestedTimeRange)) { final String[] values = pager.requestedTimeRange.split(" - "); - final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM); try { if (values.length > 0) { cb.query().setRequestedAt_GreaterEqual(parseDateTime(values[0], formatter)); @@ -401,7 +403,7 @@ public class SearchLogService { } if (StringUtil.isNotBlank(pager.requestedTimeRange)) { final String[] values = pager.requestedTimeRange.split(" - "); - final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM); try { if (values.length > 0) { cb.query().setCreatedAt_GreaterEqual(LocalDateTime.parse(values[0], formatter)); @@ -423,7 +425,7 @@ public class SearchLogService { } if (StringUtil.isNotBlank(pager.requestedTimeRange)) { final String[] values = pager.requestedTimeRange.split(" - "); - final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM); try { if (values.length > 0) { cb.query().setUpdatedAt_GreaterEqual(LocalDateTime.parse(values[0], formatter)); @@ -448,7 +450,7 @@ public class SearchLogService { } if (StringUtil.isNotBlank(pager.requestedTimeRange)) { final String[] values = pager.requestedTimeRange.split(" - "); - final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM); try { if (values.length > 0) { cb.query().setRequestedAt_GreaterEqual(LocalDateTime.parse(values[0], formatter)); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java index 6aa887305..7f07fbe8c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java @@ -20,6 +20,7 @@ import java.util.Map; import javax.validation.constraints.Size; +import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; @@ -39,5 +40,6 @@ public class CreateForm { public Map attributes = new HashMap<>(); public void initialize() { + crudMode = CrudMode.CREATE; } } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java index 0c557947b..03e6f6d37 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java @@ -20,6 +20,7 @@ import java.util.Map; import javax.validation.constraints.Size; +import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; @@ -39,5 +40,6 @@ public class CreateForm { public Map attributes = new HashMap<>(); public void initialize() { + crudMode = CrudMode.CREATE; } } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/CreateForm.java index 3575740a9..e0154aea8 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/CreateForm.java @@ -17,6 +17,7 @@ package org.codelibs.fess.app.web.admin.searchlist; import java.util.Map; +import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; /** @@ -32,5 +33,6 @@ public class CreateForm { public String q; public void initialize() { + crudMode = CrudMode.CREATE; } } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java index 596d10057..5709f0170 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java @@ -20,6 +20,7 @@ import java.util.Map; import javax.validation.constraints.Size; +import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; @@ -49,5 +50,6 @@ public class CreateForm { public String[] groups; public void initialize() { + crudMode = CrudMode.CREATE; } } diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java b/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java index 73d6eaa97..4c3622fd9 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java @@ -105,6 +105,7 @@ public class FessLoginAssist extends TypicalLoginAssist