From 1c7548d93ee63735fac945a85ed089efa4602919 Mon Sep 17 00:00:00 2001 From: Lene Wasskog <lene.wasskog@nibio.no> Date: Thu, 10 Apr 2025 12:29:42 +0200 Subject: [PATCH] feat: Always display start and end date in filter form for observations --- .../vips/logic/controller/servlet/ObservationController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java index 43bad2f8..f1245ab0 100755 --- a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java +++ b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java @@ -222,8 +222,8 @@ public class ObservationController extends HttpServlet { SessionLocaleUtil.getCurrentLocale(request).getLanguage())); request.setAttribute("hierarchyCategories", organismBean.getHierarchyCategoryNames(SessionLocaleUtil.getCurrentLocale(request))); - request.setAttribute("timeOfObservationFrom", userDefinedFrom ? timeOfObservationFrom : null); - request.setAttribute("timeOfObservationTo", userDefinedTo ? timeOfObservationTo : null); + request.setAttribute("timeOfObservationFrom", timeOfObservationFrom); + request.setAttribute("timeOfObservationTo", timeOfObservationTo); request.setAttribute("selectedPestOrganismId", pestOrganismId); request.setAttribute("selectedStatusTypeId", statusTypeId); request.setAttribute("viewOthersObservations", viewOthersObservations); -- GitLab