This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 78341f58a6d0ce67bcba2276a7540b2656706e6e Author: Kevin Morin <morin@codelutin.com> Date: Mon Feb 27 10:10:11 2017 +0100 fixes #1300 [Vote] End vote time is not diplayed on vote page --- .../main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java | 4 ++-- .../org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java index 30b1749..de38af6 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java @@ -185,14 +185,14 @@ public class ResultForPoll extends PollenActionSupport implements PollenUserSecu public String getPollBeginDate() { Date date = poll.getBeginDate(); String result = date == null ? _("pollen.common.undefined") : - getPollService().decorateDate(date); + getPollService().decorateDateTime(date); return result; } public String getPollEndDate() { Date date = poll.getEndDate(); String result = date == null ? _("pollen.common.undefined") : - getPollService().decorateDate(date); + getPollService().decorateDateTime(date); return result; } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java index a7f5bb8..e501154 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java @@ -350,14 +350,14 @@ public abstract class AbstractVoteAction extends PollenActionSupport implements public String getPollBeginDate() { Date date = poll.getBeginDate(); String result = date == null ? _("pollen.common.undefined") : - getPollService().decorateDate(date); + getPollService().decorateDateTime(date); return result; } public String getPollEndDate() { Date date = poll.getEndDate(); String result = date == null ? _("pollen.common.undefined") : - getPollService().decorateDate(date); + getPollService().decorateDateTime(date); return result; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.