- Pollen-commits - mailman.cloud.codelutin.com

r3326 - in tags: . pollen-1.3-rc3
by maven-release＠users.chorem.org April 26, 2012

April 26, 2012

Author: maven-release Date: 2012-04-26 20:29:19 +0200 (Thu, 26 Apr 2012) New Revision: 3326 Url: http://chorem.org/repositories/revision/pollen/3326 Log: [maven-release-plugin] copy for tag pollen-1.3-rc3 Added: tags/pollen-1.3-rc3/ Property changes on: tags/pollen-1.3-rc3 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3325 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org April 26, 2012

April 26, 2012

Author: maven-release Date: 2012-04-26 20:29:14 +0200 (Thu, 26 Apr 2012) New Revision: 3325 Url: http://chorem.org/repositories/revision/pollen/3325 Log: [maven-release-plugin] prepare release pollen-1.3-rc3 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-04-26 16:00:51 UTC (rev 3324) +++ trunk/pollen-persistence/pom.xml 2012-04-26 18:29:14 UTC (rev 3325) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3-rc3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-04-26 16:00:51 UTC (rev 3324) +++ trunk/pollen-services/pom.xml 2012-04-26 18:29:14 UTC (rev 3325) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3-rc3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-26 16:00:51 UTC (rev 3324) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-26 18:29:14 UTC (rev 3325) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3-rc3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-26 16:00:51 UTC (rev 3324) +++ trunk/pollen-votecounting/pom.xml 2012-04-26 18:29:14 UTC (rev 3325) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3-rc3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-26 16:00:51 UTC (rev 3324) +++ trunk/pom.xml 2012-04-26 18:29:14 UTC (rev 3325) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3-rc3</version> <modules> <module>pollen-votecounting</module> @@ -530,11 +530,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3-rc3</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3-rc3 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3-rc3</url> </scm> <distributionManagement>

1 0

r3324 - tags
by fdesbois＠users.chorem.org April 26, 2012

April 26, 2012

Author: fdesbois Date: 2012-04-26 18:00:51 +0200 (Thu, 26 Apr 2012) New Revision: 3324 Url: http://chorem.org/repositories/revision/pollen/3324 Log: Delete bad version tag Removed: tags/pollen-1.3/

1 0

r3323 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org April 26, 2012

April 26, 2012

Author: maven-release Date: 2012-04-26 16:24:03 +0200 (Thu, 26 Apr 2012) New Revision: 3323 Url: http://chorem.org/repositories/revision/pollen/3323 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-04-26 14:24:01 UTC (rev 3322) +++ trunk/pollen-persistence/pom.xml 2012-04-26 14:24:03 UTC (rev 3323) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-04-26 14:24:01 UTC (rev 3322) +++ trunk/pollen-services/pom.xml 2012-04-26 14:24:03 UTC (rev 3323) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-26 14:24:01 UTC (rev 3322) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-26 14:24:03 UTC (rev 3323) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-26 14:24:01 UTC (rev 3322) +++ trunk/pollen-votecounting/pom.xml 2012-04-26 14:24:03 UTC (rev 3323) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-26 14:24:01 UTC (rev 3322) +++ trunk/pom.xml 2012-04-26 14:24:03 UTC (rev 3323) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> <modules> <module>pollen-votecounting</module> @@ -530,11 +530,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3322 - in tags: . pollen-1.3
by maven-release＠users.chorem.org April 26, 2012

April 26, 2012

Author: maven-release Date: 2012-04-26 16:24:01 +0200 (Thu, 26 Apr 2012) New Revision: 3322 Url: http://chorem.org/repositories/revision/pollen/3322 Log: [maven-release-plugin] copy for tag pollen-1.3 Added: tags/pollen-1.3/ Property changes on: tags/pollen-1.3 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3321 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org April 26, 2012

April 26, 2012

Author: maven-release Date: 2012-04-26 16:23:59 +0200 (Thu, 26 Apr 2012) New Revision: 3321 Url: http://chorem.org/repositories/revision/pollen/3321 Log: [maven-release-plugin] prepare release pollen-1.3 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-04-26 13:27:05 UTC (rev 3320) +++ trunk/pollen-persistence/pom.xml 2012-04-26 14:23:59 UTC (rev 3321) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-04-26 13:27:05 UTC (rev 3320) +++ trunk/pollen-services/pom.xml 2012-04-26 14:23:59 UTC (rev 3321) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-26 13:27:05 UTC (rev 3320) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-26 14:23:59 UTC (rev 3321) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-26 13:27:05 UTC (rev 3320) +++ trunk/pollen-votecounting/pom.xml 2012-04-26 14:23:59 UTC (rev 3321) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-26 13:27:05 UTC (rev 3320) +++ trunk/pom.xml 2012-04-26 14:23:59 UTC (rev 3321) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <modules> <module>pollen-votecounting</module> @@ -530,11 +530,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3</url> </scm> <distributionManagement>

1 0

r3320 - in trunk: pollen-persistence/src/main/xmi pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll
by fdesbois＠users.chorem.org April 26, 2012

April 26, 2012

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());

1 0

r3319 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by fdesbois＠users.chorem.org April 26, 2012

April 26, 2012

Author: fdesbois Date: 2012-04-26 12:02:23 +0200 (Thu, 26 Apr 2012) New Revision: 3319 Url: http://chorem.org/repositories/revision/pollen/3319 Log: fixes #536 : - missing # for choice date and image in JSP - use choice creators on poll loading (need specific instances depends on ChoiceType) - improve choice update Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-04-25 10:45:30 UTC (rev 3318) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-04-26 10:02:23 UTC (rev 3319) @@ -35,6 +35,8 @@ import org.chorem.pollen.business.persistence.PollAccountImpl; import org.chorem.pollen.business.persistence.VotingList; import org.chorem.pollen.business.persistence.VotingListImpl; +import org.chorem.pollen.common.ChoiceType; +import org.nuiton.topia.persistence.TopiaEntity; import java.util.Date; import java.util.List; @@ -68,6 +70,10 @@ } } + public static TopiaIdExtractor newTopiaIdExtractor() { + return new TopiaIdExtractor(); + } + public static TextChoiceCreator newTextChoiceCreator() { return new TextChoiceCreator(); } @@ -80,6 +86,25 @@ return new DateChoiceCreator(); } + public static Function<Choice, Choice> newChoiceCreator(ChoiceType choiceType) { + Function<Choice, Choice> result; + switch (choiceType) { + + case DATE: + result = newDateChoiceCreator(); + break; + + case IMAGE: + result = newImageChoiceCreator(); + break; + + default: + case TEXT: + result = newTextChoiceCreator(); + } + return result; + } + public static Function<VotingList, VotingList> newVotingListCreator( Function<PersonToList, PersonToList> persontoListCreator) { return new VotingListCreator(persontoListCreator); @@ -88,7 +113,15 @@ public static Function<PersonToList, PersonToList> newPersonToListCreator() { return new PersonToListCreator(); } + + public static class TopiaIdExtractor implements Function<TopiaEntity, String> { + @Override + public String apply(TopiaEntity input) { + return input.getTopiaId(); + } + } + public static class TextChoiceCreator implements Function<Choice, Choice> { @Override Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-04-25 10:45:30 UTC (rev 3318) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-04-26 10:02:23 UTC (rev 3319) @@ -23,9 +23,14 @@ */ package org.chorem.pollen.services.impl; +import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.base.Preconditions; +import com.google.common.base.Predicates; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -53,6 +58,7 @@ import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; import org.chorem.pollen.entities.PollenBinderHelper; +import org.chorem.pollen.services.PollenServiceFunctions; import org.chorem.pollen.services.PollenServiceSupport; import org.chorem.pollen.services.exceptions.PollAccountNotFound; import org.chorem.pollen.services.exceptions.PollChoiceNotFoundException; @@ -72,6 +78,8 @@ import java.net.URL; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Set; public class PollService extends PollenServiceSupport { @@ -184,15 +192,23 @@ } // -- Choice -- // - ChoiceDAO choiceDAO = getDAO(Choice.class); - for (Choice choiceLoaded : source.getChoice()) { - Choice choiceEditable = newInstance(choiceDAO); - result.addChoice(choiceEditable); - // Do not keep choices topiaId, to simplify the update will delete old choices and create new ones - PollenBinderHelper.simpleCopy( - choiceLoaded, choiceEditable, false); - } + Function<Choice, Choice> choiceCreator = + PollenServiceFunctions.newChoiceCreator(source.getChoiceType()); + Iterable<Choice> choices = + Iterables.transform(source.getChoice(), choiceCreator); + // Ensure iteration with a new ArrayList instead of TransformingSequentialList + // from guava Lists#transform() that doesn't support add() method + result.setChoice(Lists.newArrayList(choices)); + +// for (Choice choiceLoaded : source.getChoice()) { +// Choice choiceEditable = newInstance(choiceDAO); +// result.addChoice(choiceEditable); +// // Do not keep choices topiaId, to simplify the update will delete old choices and create new ones +// PollenBinderHelper.simpleCopy( +// choiceLoaded, choiceEditable, false); +// } + // -- VotingList -- // VotingListDAO votingListDAO = getDAO(VotingList.class); PersonToListDAO personToListDAO = getDAO(PersonToList.class); @@ -341,11 +357,27 @@ // -- Choices -- // if (!voteStarted) { - - pollToUpdate.clearChoice(); + + // Retrieve previous existing choices + Map<String, Choice> choicesExist = Maps.uniqueIndex( + pollToUpdate.getChoice(), + PollenServiceFunctions.newTopiaIdExtractor() + ); + + // Save all choices from source poll + Set<String> choicesAdded = Sets.newHashSet(); for (Choice choice : poll.getChoice()) { - saveChoice(pollToUpdate, choice); + String choiceId = saveChoice(pollToUpdate, choice); + choicesAdded.add(choiceId); } + + // Delete all previous choices not keeped in source poll + Map<String, Choice> choicesToDelete = + Maps.filterKeys(choicesExist, + Predicates.not(Predicates.in(choicesAdded))); + for (Choice choice : choicesToDelete.values()) { + pollToUpdate.removeChoice(choice); + } } // -- PreventRules -- // @@ -724,7 +756,7 @@ commitTransaction("Can't create new choice [" + poll.getChoiceType() + "] for poll '" + pollId + "'"); } - protected void saveChoice(Poll poll, Choice choice) { + protected String saveChoice(Poll poll, Choice choice) { ChoiceType choiceType = poll.getChoiceType(); ChoiceDAO dao = getDAO(Choice.class); @@ -764,6 +796,8 @@ choiceLoaded.setValidate(choice.isValidate()); choiceLoaded.setName(choice.getName()); } + + return choiceLoaded.getTopiaId(); } public void deleteChoice(String pollId, String choiceId) Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-04-25 10:45:30 UTC (rev 3318) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-04-26 10:02:23 UTC (rev 3319) @@ -97,7 +97,7 @@ theme="simple" value=''/> <sj:datepicker id='%{#prefix}.name' key="%{#prefix}.name" changeMonth="true" changeYear="true" labelSeparator="" theme="simple" label="" - timepicker="true" value="%{choice.date}" + timepicker="true" value="%{#choice.date}" displayFormat="%{getText('pollen.common.datePickerPattern')}" disabled="%{voteStarted}"/> - @@ -107,7 +107,7 @@ <div class="fleft"> <s:textarea cols="30" id="%{#prefix}.description" key="%{#prefix}.description" label='' theme="simple" - value="%{choice.description}" + value="%{#choice.description}" disabled="%{voteStarted}"/> </div> <s:if test="!voteStarted"> @@ -150,13 +150,13 @@ <%--Uploaded image--%> <s:hidden id="%{#prefix}.name" name="%{#prefix}.name" - value="%{choice.name}" label='' theme="simple"/> + value="%{#choice.name}" label='' theme="simple"/> <s:hidden id="%{#prefix}.location" name="%{#prefix}.location" - value="%{choice.location}" label='' theme="simple"/> + value="%{#choice.location}" label='' theme="simple"/> <s:label label='' theme="simple" cssClass="nameField" - value="%{choice.name}" readonly="true"/> + value="%{#choice.name}" readonly="true"/> </s:if> <s:else> <%--New image--%> @@ -169,7 +169,7 @@ </div> <div class="fleft"> <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" - key="%{#prefix}.description" value="%{choice.description}" + key="%{#prefix}.description" value="%{#choice.description}" disabled="%{voteStarted}"/> </div> <s:if test="!voteStarted">

1 0

r3318 - in trunk/src/site: fr/rst rst
by ymartel＠users.chorem.org April 25, 2012

April 25, 2012

Author: ymartel Date: 2012-04-25 12:45:30 +0200 (Wed, 25 Apr 2012) New Revision: 3318 Url: http://chorem.org/repositories/revision/pollen/3318 Log: fix home directory for config file in doc Modified: trunk/src/site/fr/rst/install.rst trunk/src/site/rst/install.rst Modified: trunk/src/site/fr/rst/install.rst =================================================================== --- trunk/src/site/fr/rst/install.rst 2012-04-25 10:39:47 UTC (rev 3317) +++ trunk/src/site/fr/rst/install.rst 2012-04-25 10:45:30 UTC (rev 3318) @@ -36,9 +36,9 @@ Par défaut une base de donnée H2 est créée dans le répertoire */tmp*. Pour modifier ce comportement par défaut il suffit de créer le fichier -*/etc/pollen.properties* (qui peut aussi être placé dans le répertoire de -l'utilisateur ($HOME) ou dans le dossier depuis lequel l'application est lancée) -et de le remplir avec les propriétés suivantes :: +*/etc/pollen.properties* (qui peut aussi être placé dans un répertoire +*".config/"* de l'utilisateur ($HOME/.config/) ou dans le dossier depuis lequel +l'application est lancée) et de le remplir avec les propriétés suivantes :: # Configuration de la base de données hibernate.show_sql=false @@ -95,4 +95,4 @@ Vous pouvez aussi utiliser des options de lancement : http://winstone.sourceforge.net/#commandLine -.. _Tomcat: http://tomcat.apache.org/ \ No newline at end of file +.. _Tomcat: http://tomcat.apache.org/ Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2012-04-25 10:39:47 UTC (rev 3317) +++ trunk/src/site/rst/install.rst 2012-04-25 10:45:30 UTC (rev 3318) @@ -38,9 +38,9 @@ By default, a H2 database is created in the */tmp* directory. To modify this behaviour, you only need to create the */etc/pollen.properties* file ( you can -put it into the directory from which you launch the application or your home -directory) and to fill -it with the following properties :: +put it into the directory from which you launch the application or in a +*".config/"* directory in your home directory) and to fill it with the following +properties :: # database configuration hibernate.show_sql=false @@ -96,4 +96,4 @@ You can also use command line option to configure launch : http://winstone.sourceforge.net/#commandLine -.. _Tomcat: http://tomcat.apache.org/ \ No newline at end of file +.. _Tomcat: http://tomcat.apache.org/

1 0

r3317 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security pollen-ui-struts2/src/main/resources pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security
by fdesbois＠users.chorem.org April 25, 2012

April 25, 2012

Author: fdesbois Date: 2012-04-25 12:39:47 +0200 (Wed, 25 Apr 2012) New Revision: 3317 Url: http://chorem.org/repositories/revision/pollen/3317 Log: fixes #535 : security on result page Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java trunk/pollen-ui-struts2/src/main/resources/shiro.ini Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-04-25 09:37:55 UTC (rev 3316) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-04-25 10:39:47 UTC (rev 3317) @@ -799,6 +799,21 @@ } } + public void checkPollResult(PollUri uri) throws PollNotFoundException, UnauthorizedPollAccessException { + + String pollId = uri.getPollId(); + + Poll poll = getPollByPollId(pollId); + + if (poll == null) { + throw new PollNotFoundException(); + } + + if (!poll.isPublicResults()) { + throw new UnauthorizedPollAccessException(); + } + } + public void checkPollAccount(PollUri uri) throws PollNotFoundException, UnauthorizedPollAccessException { String pollId = uri.getPollId(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-04-25 09:37:55 UTC (rev 3316) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-04-25 10:39:47 UTC (rev 3317) @@ -108,7 +108,11 @@ protected Set<String> getPollFunctions(Poll poll) { Set<String> result = Sets.newHashSet(); result.add("vote"); - result.add("result"); + if (poll.isPublicResults()) { + + // only if results are public + result.add("result"); + } return result; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-04-25 09:37:55 UTC (rev 3316) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-04-25 10:39:47 UTC (rev 3317) @@ -102,7 +102,11 @@ private Set<String> getPollFunctions(Poll poll) { Set<String> result = Sets.newHashSet(); result.add("vote"); - result.add("result"); + if (poll.isPublicResults()) { + + // only if results are public + result.add("result"); + } return result; } } \ No newline at end of file Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java 2012-04-25 10:39:47 UTC (rev 3317) @@ -0,0 +1,93 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.security; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.bean.PollUri; +import org.chorem.pollen.services.PollenServiceContext; +import org.chorem.pollen.services.exceptions.PollNotFoundException; +import org.chorem.pollen.services.exceptions.UnauthorizedPollAccessException; +import org.chorem.pollen.services.impl.PollService; + +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +public class ResultAccessRequired extends AbstractPollenAuthorization { + + private static final Log log = + LogFactory.getLog(ResultAccessRequired.class); + + protected final PollAccessRequired pollAccountFilter; + + public ResultAccessRequired() { + pollAccountFilter = new PollAccessRequired(); + } + + @Override + protected boolean isAccessAllowed(ServletRequest request, + ServletResponse response, + Object mappedValue) { + + boolean isAccessAllowed; + + // Must be a valid user + if (pollAccountFilter.isAccessAllowed(request, response, mappedValue)) { + + PollUri pollUri = getPollUri(request); + + PollenServiceContext serviceContext = + getServiceContext(request); + + PollService pollService = + serviceContext.newService(PollService.class); + + try { + pollService.checkPollResult(pollUri); + isAccessAllowed = true; + + if (log.isDebugEnabled()) { + log.debug("Can display result for this poll " + pollUri.getPollId()); + } + } catch (PollNotFoundException e) { + if (log.isDebugEnabled()) { + log.debug("Poll not found!"); + } + isAccessAllowed = false; + } catch (UnauthorizedPollAccessException e) { + if (log.isDebugEnabled()) { + log.debug("User can not access page"); + } + isAccessAllowed = false; + } + + } else { + + isAccessAllowed = false; + } + + return isAccessAllowed; + } + +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/resources/shiro.ini =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-04-25 09:37:55 UTC (rev 3316) +++ trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-04-25 10:39:47 UTC (rev 3317) @@ -15,6 +15,9 @@ pollCreator=org.chorem.pollen.ui.security.PollCreatorRequired pollCreator.unauthorizedUrl=/security/poll_creator_required +resultAccess=org.chorem.pollen.ui.security.ResultAccessRequired +resultAccess.unauthorizedUrl=/security/result_access_required + [urls] # anon urls @@ -40,7 +43,7 @@ # is pollAccount (can vote and see result of a poll) /poll/votefor/**=poll,pollAccess -/poll/results/**=poll,pollAccess +/poll/results/**=poll,resultAccess # is pollCreator (can admin a poll) /poll/modification/**=poll,pollCreator Added: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp 2012-04-25 10:39:47 UTC (rev 3317) @@ -0,0 +1,29 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<div class="info_error"> + <ul class="actionErrors"> + <li><span>Vous n'êtes pas autorisé à accéder à cette page de résultas.</span></li> + </ul> +</div> \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0