Author: fdesbois Date: 2012-04-26 15:27:05 +0200 (Thu, 26 Apr 2012) New Revision: 3320 Url: http://chorem.org/repositories/revision/pollen/3320 Log: fixes #203 : add orderBy for vote and choice + resolve issue with messages doubloon on vote page Modified: trunk/pollen-persistence/src/main/xmi/pollen.properties trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java Modified: trunk/pollen-persistence/src/main/xmi/pollen.properties =================================================================== --- trunk/pollen-persistence/src/main/xmi/pollen.properties 2012-04-26 10:02:23 UTC (rev 3319) +++ trunk/pollen-persistence/src/main/xmi/pollen.properties 2012-04-26 13:27:05 UTC (rev 3320) @@ -28,3 +28,10 @@ model.tagvalue.version=1.3 model.tagvalue.doNotGenerateBooleanGetMethods=true model.tagvalue.indexForeignKeys=true + +org.chorem.pollen.business.persistence.Poll.attribute.choice.stereotype=ordered +org.chorem.pollen.business.persistence.Poll.attribute.choice.tagvalue.orderBy=topiaCreateDate + +org.chorem.pollen.business.persistence.Poll.attribute.vote.stereotype=ordered +org.chorem.pollen.business.persistence.Poll.attribute.vote.tagvalue.orderBy=topiaCreateDate + Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-04-26 10:02:23 UTC (rev 3319) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-04-26 13:27:05 UTC (rev 3320) @@ -294,6 +294,18 @@ creatorUser = getPollenUserAccount() != null && getPollenUserAccount().equals(poll.getCreator().getUserAccount()); + // Messages + if (poll.isClosed()) { + addActionMessage(_("pollen.information.pollClosed")); + } else if (!isPollStarted()) { + addActionMessage(_("pollen.information.pollNotStarted")); + } else if (isPollFinished()) { + addActionMessage(_("pollen.information.pollFinished")); + } + if (isPollChoiceRunning()) { + addActionMessage(_("pollen.information.pollChoiceRunning")); + } + if (log.isInfoEnabled()) { Date now = serviceContext.getCurrentTime(); log.info("pollChoiceOrVoteStarted = " + isPollChoiceOrVoteStarted()); @@ -376,17 +388,6 @@ Preconditions.checkNotNull(poll, "Can't load poll with id = [" + pollId + "]"); log.debug("Poll TopiaId: " + poll.getTopiaId()); - - if (poll.isClosed()) { - addActionMessage(_("pollen.information.pollClosed")); - } else if (!isPollStarted()) { - addActionMessage(_("pollen.information.pollNotStarted")); - } else if (isPollFinished()) { - addActionMessage(_("pollen.information.pollFinished")); - } - if (isPollChoiceRunning()) { - addActionMessage(_("pollen.information.pollChoiceRunning")); - } } protected void loadPollComments() { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-04-26 10:02:23 UTC (rev 3319) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-04-26 13:27:05 UTC (rev 3320) @@ -109,9 +109,6 @@ // REMARQUES : // - pas le droit de modif si le pollAccount est rattaché a un userAccount et qu'on est pas loggé ?!? // - Ce serait plus simple que l'Admin ne puisse jamais voter, il ne peut que modérer les votes - - // VALIDATION :: - // - account not exists (matching userAccount) > check on all votes (EXISTS userAccount FROM poll.votes) >>> secu ? if (getVote().getTopiaId() != null) { getVoteService().updateVote(getVote());