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

r3659 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 18:58:57 +0200 (Tue, 28 Aug 2012) New Revision: 3659 Url: http://chorem.org/repositories/revision/pollen/3659 Log: refs add skeleton to test pollCommentVisibility Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-08-28 16:58:40 UTC (rev 3658) +++ trunk/pollen-ui-struts2/pom.xml 2012-08-28 16:58:57 UTC (rev 3659) @@ -625,6 +625,7 @@ <configuration> <pomIncludes> <pomInclude>pollVoteVisibility/pom.xml</pomInclude> + <pomInclude>pollCommentVisibility/pom.xml</pomInclude> <pomInclude>createPoll/pom.xml</pomInclude> <pomInclude>security/pom.xml</pomInclude> </pomIncludes>

1 0

28 Aug '12

Author: tchemit Date: 2012-08-28 18:58:40 +0200 (Tue, 28 Aug 2012) New Revision: 3658 Url: http://chorem.org/repositories/revision/pollen/3658 Log: refs add skeleton to test pollCommentVisibility Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/LICENSE.txt trunk/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt trunk/pollen-ui-struts2/src/it/pollCommentVisibility/changelog.txt trunk/pollen-ui-struts2/src/it/pollCommentVisibility/goals.txt trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/db/ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/db/pollendb.h2.db trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/ Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .idea Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt 2012-08-28 16:58:40 UTC (rev 3658) @@ -0,0 +1,150 @@ +================== +PollVoteVisibility +================== + +Pour tester la portée des commentaires (http://chorem.org/issues/743) + +anonymous free poll +------------------- + +by not connected user +~~~~~~~~~~~~~~~~~~~~~ + +admin poll/summrary/cacb52f4d49047b7a7aa24ec528fcc87:e814ba6e25174d5983ad796c400520f5 (peut voter) +vote anonyme cacb52f4d49047b7a7aa24ec528fcc87:56acbf87f3c049c2adc757ef1da88ee1 (a,b) (votes non visibles) +vote creator (interdit, votes non visibles) +vote moderate (votes non visibles) +vote user cacb52f4d49047b7a7aa24ec528fcc87:c54a12ffde5d44a4ad9e609aa644fc80 (a) (votes non visibles) (sondage non present dans sondages participes) +vote admin cacb52f4d49047b7a7aa24ec528fcc87:15500943e49842c88d6ceeefaa62e2ed (b) (votes non visibles) (sondage non present dans sondages participes) + +by connected user +~~~~~~~~~~~~~~~~~ + +admin poll/summrary/fdd43f4c8d614a9aa48047804583508a:9a8e8523f1ba404f8fde45d1844c59ac (peut voter) +vote anonyme fdd43f4c8d614a9aa48047804583508a:07dc154dce514d368441eaa9f27d21e0 (a,b) (votes non visibles) +vote creator (interdit connecté ou pas, votes non visibles) +vote moderate (votes non visibles) +vote user fdd43f4c8d614a9aa48047804583508a:e67a14d729c7440ebe4a55d589cba515 (a) (votes non visibles) (sondage non present dans sondages participes) +vote admin fdd43f4c8d614a9aa48047804583508a:29993520034a41168def96f908d2696b (b) (votes non visibles) (sondage non present dans sondages participes) +sondage crées (sondage present, peut voter) + +by admin user +~~~~~~~~~~~~~ + +admin poll/summrary/87cb5b1529374ac0b8c6b7f0b98e169c:65a3caf0bf204226bfcd259c69e56ca8 (peut voter) +vote anonyme 87cb5b1529374ac0b8c6b7f0b98e169c:a0ff6892a28b4a65809b16cd8903245e (a,b) +vote creator (interdit connecté ou pas, votes non visibles) +vote moderate (votes non visibles) +vote user 87cb5b1529374ac0b8c6b7f0b98e169c:fd47e01378354fcaa220a4ffd0974417 (a) (votes non visibles) (sondage non present dans sondages participes) +vote admin 87cb5b1529374ac0b8c6b7f0b98e169c:010f05042ff3485c834d1ecdc4d17f1e (b) (votes non visibles) (sondage non present dans sondages participes) +sondage crées (sondage present, peut voter) + +onlyCreator free poll +--------------------- + +by not connected user +~~~~~~~~~~~~~~~~~~~~~ + +admin poll/summrary/e61a350a1d714e479aad526ee85b7bc6:8517bd2f6b414072b3d9d6c4cb7e5fd0 (peut voter) +vote anonyme e61a350a1d714e479aad526ee85b7bc6:e8fd28021faa434aa466c5f6bdbc6e94 (a,b) (votes non visibles) +vote creator (vote interdit, votes visibles) +vote moderate (vote interdit, votes visibles) +vote user e61a350a1d714e479aad526ee85b7bc6:52ef06ee93dd4095ae7498edb9e1c28e (a) (votes visibles) (sondage present dans sondages participes) +vote admin e61a350a1d714e479aad526ee85b7bc6:c86b0b775e154fdeaf51ae1e5ef4074d (b) (votes visibles) (sondage present dans sondages participes) + en connecté peut admin les votes, mais pas en deconnecté +sondage crées (sondage present, peut voter) + +by connected user +~~~~~~~~~~~~~~~~~ + +admin poll/summrary/075ab18c50c74f83b894c042bba84ff5:0f51b7c953f6427f9c85807fa838d44f (peut voter) +vote anonyme 075ab18c50c74f83b894c042bba84ff5:4937a887797a4ab5ac618152383512ae (a,b) (votes non visibles) +vote creator (vote interdit mais peut admin les votes) +vote moderate (vote interdit mais peut admin les votes) +vote user 075ab18c50c74f83b894c042bba84ff5:f162acd5dd8a4242a6f38b098ecec3c3 (a) (votes visibles si connecté) (sondage present dans sondages participes) +vote user2 075ab18c50c74f83b894c042bba84ff5:320e5771bede4c64888a7254fc84a56c () (votes non visibles) (sondage present dans sondages participes) +vote admin 075ab18c50c74f83b894c042bba84ff5:02dbe56ac36d458d95f1fe07ba783f61 (b) (votes visibles si connecté) (sondage present dans sondages participes) +sondage crées (sondage present, peut voter) + +by admin user +~~~~~~~~~~~~~ + +admin poll/summrary/a04bd349d8964c4fad48ac6ececc60a0:a1346bb80bb84913983e91673c76e80c (peut voter) +vote anonyme a04bd349d8964c4fad48ac6ececc60a0:e6fa20f2afb24bdebfdc579c2574a3ab (a,b) (votes non visibles) +vote creator (vote interdit mais peut admin les votes) +vote moderate (vote interdit mais peut admin les votes) +vote user a04bd349d8964c4fad48ac6ececc60a0:01b2b146c6874593b678261f42014935 (a) (votes non visibles) (sondage present dans sondages participes) +vote admin a04bd349d8964c4fad48ac6ececc60a0:cf4f77e74b2f40428595452ce2ee6fbf (b) (sondage present dans sondages participes) +sondage crées (sondage present, peut voter) + +onlyVoter free poll +-------------------- + +by not connected user +~~~~~~~~~~~~~~~~~~~~~ + +admin poll/summrary/8518ede7bf1247d2ba0dfe222575c5ba:ea5c96d4d44547f9b0717f30bfa6dd03 (peut voter) +vote anonyme 8518ede7bf1247d2ba0dfe222575c5ba:fa914a31f6c94cfa8561f48e3c45d6cf (a,b) (votes visibles) +vote creator (vote interdit mais peut admin les votes) +vote moderate (vote interdit mais peut admin les votes) +vote user 8518ede7bf1247d2ba0dfe222575c5ba:5c67d277460b4b4eb1fb59a26bf4a622 (a) (votes visibles connecté ou non) (sondage present dans sondages participes) +vote admin 8518ede7bf1247d2ba0dfe222575c5ba:28d450be407e4eabbb787739ec27ae52 (b) (votes visibles connecté ou non) (sondage present dans sondages participes) +sondage crées (sondage present, peut voter) + +by connected user +~~~~~~~~~~~~~~~~~ + +admin poll/summrary/b321ddccf7d743bf9c67b2664231d14f:a48f1b97a3f84443845009c074298bce (peut voter) +vote anonyme b321ddccf7d743bf9c67b2664231d14f:938e4831d7d547a59fd6d76c3bdfe6b5 (a,b) (votes visibles) +vote creator (vote interdit mais peut admin les votes) +vote moderate (vote interdit mais peut admin les votes) +vote user b321ddccf7d743bf9c67b2664231d14f:b3e407acc97b4911b0de470b1d45a68f (a) (votes visibles connecté ou non) (sondage present dans sondages participes) +vote admin b321ddccf7d743bf9c67b2664231d14f:6f980a4541e04edd9dec95d3dbde0830 (b) (votes visibles connecté ou non) (sondage present dans sondages participes) +sondage crées (sondage present, peut voter) + +by admin user +~~~~~~~~~~~~~ + +admin poll/summrary/7103c6d4a79246699425e99e1f344b98:717ebe61a3b64fcea453c9cba5953149 (peut voter) +vote anonyme 7103c6d4a79246699425e99e1f344b98:ad50a5d406d84aa09e3a02dd9ad0116c (a,b) (vote visibles) +vote creator (vote interdit mais peut admin les votes) +vote moderate (vote interdit mais peut admin les votes) +vote user 7103c6d4a79246699425e99e1f344b98:24abe4ba077341b489af505531ac93de (a) (sondage present dans sondages participes) +vote admin 7103c6d4a79246699425e99e1f344b98:2237dbc51f7c4268a8a7e10f6146ae87 (b) (sondage present dans sondages participes) +sondage crées (sondage present, peut voter) + +everybody free poll +------------------- + +by not connected user +~~~~~~~~~~~~~~~~~~~~~ + +admin poll/summrary/2262a31f374e4969bb3593e762c0cae6:659bb046fc06493f9909ca9f34ca6261 (peut voter) +vote anonyme 2262a31f374e4969bb3593e762c0cae6:6909131490ab4a1abae0daaf15129cdb (a,b) (votes visibles) +vote creator (vote interdit mais peut admin les votes) +vote moderate (vote interdit mais peut admin les votes) +vote user 2262a31f374e4969bb3593e762c0cae6:f058910736af48e9905f83f3f5de5b8d (a) (sondage present dans sondages participes) +vote admin 2262a31f374e4969bb3593e762c0cae6:2d97c079df054a7c9fc321b2df3488f3 (b) (sondage present dans sondages participes) +sondage crées (sondage present, peut voter) + +by connected user +~~~~~~~~~~~~~~~~~ + +admin poll/summrary/4cd79d032aa7433d9944ec9376c385c0:f26e253004d14547b465b5a414b65a7f (peut voter) +vote anonyme 4cd79d032aa7433d9944ec9376c385c0:307222b5e17442758bd23fc9d8a19f5e (a,b) (votes visibles) +vote creator (vote interdit mais peut admin les votes) +vote moderate (vote interdit mais peut admin les votes) +vote user 4cd79d032aa7433d9944ec9376c385c0:8a10f049538142669ca84bb034f7a886 (a) (sondage present dans sondages participes) +vote admin 4cd79d032aa7433d9944ec9376c385c0:6e92bf48f672429ea265a2647bef415d (b) (sondage present dans sondages participes) +sondage crées (sondage present, peut voter) + +by admin user +~~~~~~~~~~~~~ + +admin poll/summrary/3300e59939bd4c9797e360060b8e54be:c370172faf7a4108be0d76630af34c4b (peut voter) +vote anonyme 3300e59939bd4c9797e360060b8e54be:4399e0ff6dbe4544b64861d1e234ee1a (a,b) (sondage present dans sondages participes) +vote creator (vote interdit mais peut admin les votes) +vote moderate (vote interdit mais peut admin les votes) +vote user 3300e59939bd4c9797e360060b8e54be:5af1c33357084f89a56d1cde89584cb7 (a) (sondage present dans sondages participes) +vote admin 3300e59939bd4c9797e360060b8e54be:335e6a3921fb4dd5b6220c55311b7931 (b) (sondage present dans sondages participes) +sondage crées (sondage present, peut voter) \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/goals.txt =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/goals.txt (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/goals.txt 2012-08-28 16:58:40 UTC (rev 3658) @@ -0,0 +1 @@ +clean post-integration-test -DrunIts \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml 2012-08-28 16:58:40 UTC (rev 3658) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.chorem.pollen.it</groupId> + <artifactId>pollen-ui-it</artifactId> + <version>1.4.5-SNAPSHOT</version> + <relativePath>../pollen-ui-it/pom.xml</relativePath> + </parent> + + <artifactId>pollCommentVisibility</artifactId> + <name>Pollen :: IT pollCommentVisibility</name> + <description>pollCommentVisibility</description> + +</project> + Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml 2012-08-28 16:58:40 UTC (rev 3658) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> + +<Configure class="org.eclipse.jetty.webapp.WebAppContext"> + <Call name="setAttribute"> + <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> + <Arg>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> + </Call> +</Configure> \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java 2012-08-28 16:58:40 UTC (rev 3658) @@ -0,0 +1,15 @@ +package org.chorem.pollen.ui.it; + +import org.openqa.selenium.WebDriver; + +/** + * Poll with comment possible. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4.5 + */ +public class PollWithCommentIT extends AbstractPollIT { + protected PollWithCommentIT(Class<? extends WebDriver> driverType) { + super(driverType, ""); + } +} Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java 2012-08-28 16:58:40 UTC (rev 3658) @@ -0,0 +1,15 @@ +package org.chorem.pollen.ui.it; + +import org.openqa.selenium.WebDriver; + +/** + * Poll with no comment possible. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4.5 + */ +public class PollWithoutCommentIT extends AbstractPollIT { + protected PollWithoutCommentIT(Class<? extends WebDriver> driverType) { + super(driverType, ""); + } +} Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java 2012-08-28 16:58:40 UTC (rev 3658) @@ -0,0 +1,21 @@ +package org.chorem.pollen.ui.it; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * Tests to execute in that it. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4.5 + */ +(a)RunWith(Suite.class) +(a)Suite.SuiteClasses( + { + PollWithCommentIT.class, + PollWithoutCommentIT.class, + CleanDrivers.class + } +) +public class PollenTestSuite { +} Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data ___________________________________________________________________ Added: svn:ignore + emails tmp uploadedImages Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/db/pollendb.h2.db =================================================================== (Binary files differ) Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/db/pollendb.h2.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r3657 - in trunk/pollen-ui-struts2/src/it/pollVoteVisibility: . src/test/java/org/chorem/pollen/ui/it
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 18:58:13 +0200 (Tue, 28 Aug 2012) New Revision: 3657 Url: http://chorem.org/repositories/revision/pollen/3657 Log: fix pollVoteVisibiliti readme and test suite Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/README.txt trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/README.txt =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/README.txt 2012-08-28 16:46:52 UTC (rev 3656) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/README.txt 2012-08-28 16:58:13 UTC (rev 3657) @@ -2,149 +2,4 @@ PollVoteVisibility ================== -Pour tester la portée des votes (http://chorem.org/issues/742) - -anonymous free poll -------------------- - -by not connected user -~~~~~~~~~~~~~~~~~~~~~ - -admin poll/summrary/cacb52f4d49047b7a7aa24ec528fcc87:e814ba6e25174d5983ad796c400520f5 (peut voter) -vote anonyme cacb52f4d49047b7a7aa24ec528fcc87:56acbf87f3c049c2adc757ef1da88ee1 (a,b) (votes non visibles) -vote creator (interdit, votes non visibles) -vote moderate (votes non visibles) -vote user cacb52f4d49047b7a7aa24ec528fcc87:c54a12ffde5d44a4ad9e609aa644fc80 (a) (votes non visibles) (sondage non present dans sondages participes) -vote admin cacb52f4d49047b7a7aa24ec528fcc87:15500943e49842c88d6ceeefaa62e2ed (b) (votes non visibles) (sondage non present dans sondages participes) - -by connected user -~~~~~~~~~~~~~~~~~ - -admin poll/summrary/fdd43f4c8d614a9aa48047804583508a:9a8e8523f1ba404f8fde45d1844c59ac (peut voter) -vote anonyme fdd43f4c8d614a9aa48047804583508a:07dc154dce514d368441eaa9f27d21e0 (a,b) (votes non visibles) -vote creator (interdit connecté ou pas, votes non visibles) -vote moderate (votes non visibles) -vote user fdd43f4c8d614a9aa48047804583508a:e67a14d729c7440ebe4a55d589cba515 (a) (votes non visibles) (sondage non present dans sondages participes) -vote admin fdd43f4c8d614a9aa48047804583508a:29993520034a41168def96f908d2696b (b) (votes non visibles) (sondage non present dans sondages participes) -sondage crées (sondage present, peut voter) - -by admin user -~~~~~~~~~~~~~ - -admin poll/summrary/87cb5b1529374ac0b8c6b7f0b98e169c:65a3caf0bf204226bfcd259c69e56ca8 (peut voter) -vote anonyme 87cb5b1529374ac0b8c6b7f0b98e169c:a0ff6892a28b4a65809b16cd8903245e (a,b) -vote creator (interdit connecté ou pas, votes non visibles) -vote moderate (votes non visibles) -vote user 87cb5b1529374ac0b8c6b7f0b98e169c:fd47e01378354fcaa220a4ffd0974417 (a) (votes non visibles) (sondage non present dans sondages participes) -vote admin 87cb5b1529374ac0b8c6b7f0b98e169c:010f05042ff3485c834d1ecdc4d17f1e (b) (votes non visibles) (sondage non present dans sondages participes) -sondage crées (sondage present, peut voter) - -onlyCreator free poll ---------------------- - -by not connected user -~~~~~~~~~~~~~~~~~~~~~ - -admin poll/summrary/e61a350a1d714e479aad526ee85b7bc6:8517bd2f6b414072b3d9d6c4cb7e5fd0 (peut voter) -vote anonyme e61a350a1d714e479aad526ee85b7bc6:e8fd28021faa434aa466c5f6bdbc6e94 (a,b) (votes non visibles) -vote creator (vote interdit, votes visibles) -vote moderate (vote interdit, votes visibles) -vote user e61a350a1d714e479aad526ee85b7bc6:52ef06ee93dd4095ae7498edb9e1c28e (a) (votes visibles) (sondage present dans sondages participes) -vote admin e61a350a1d714e479aad526ee85b7bc6:c86b0b775e154fdeaf51ae1e5ef4074d (b) (votes visibles) (sondage present dans sondages participes) - en connecté peut admin les votes, mais pas en deconnecté -sondage crées (sondage present, peut voter) - -by connected user -~~~~~~~~~~~~~~~~~ - -admin poll/summrary/075ab18c50c74f83b894c042bba84ff5:0f51b7c953f6427f9c85807fa838d44f (peut voter) -vote anonyme 075ab18c50c74f83b894c042bba84ff5:4937a887797a4ab5ac618152383512ae (a,b) (votes non visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 075ab18c50c74f83b894c042bba84ff5:f162acd5dd8a4242a6f38b098ecec3c3 (a) (votes visibles si connecté) (sondage present dans sondages participes) -vote user2 075ab18c50c74f83b894c042bba84ff5:320e5771bede4c64888a7254fc84a56c () (votes non visibles) (sondage present dans sondages participes) -vote admin 075ab18c50c74f83b894c042bba84ff5:02dbe56ac36d458d95f1fe07ba783f61 (b) (votes visibles si connecté) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -by admin user -~~~~~~~~~~~~~ - -admin poll/summrary/a04bd349d8964c4fad48ac6ececc60a0:a1346bb80bb84913983e91673c76e80c (peut voter) -vote anonyme a04bd349d8964c4fad48ac6ececc60a0:e6fa20f2afb24bdebfdc579c2574a3ab (a,b) (votes non visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user a04bd349d8964c4fad48ac6ececc60a0:01b2b146c6874593b678261f42014935 (a) (votes non visibles) (sondage present dans sondages participes) -vote admin a04bd349d8964c4fad48ac6ececc60a0:cf4f77e74b2f40428595452ce2ee6fbf (b) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -onlyVoter free poll --------------------- - -by not connected user -~~~~~~~~~~~~~~~~~~~~~ - -admin poll/summrary/8518ede7bf1247d2ba0dfe222575c5ba:ea5c96d4d44547f9b0717f30bfa6dd03 (peut voter) -vote anonyme 8518ede7bf1247d2ba0dfe222575c5ba:fa914a31f6c94cfa8561f48e3c45d6cf (a,b) (votes visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 8518ede7bf1247d2ba0dfe222575c5ba:5c67d277460b4b4eb1fb59a26bf4a622 (a) (votes visibles connecté ou non) (sondage present dans sondages participes) -vote admin 8518ede7bf1247d2ba0dfe222575c5ba:28d450be407e4eabbb787739ec27ae52 (b) (votes visibles connecté ou non) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -by connected user -~~~~~~~~~~~~~~~~~ - -admin poll/summrary/b321ddccf7d743bf9c67b2664231d14f:a48f1b97a3f84443845009c074298bce (peut voter) -vote anonyme b321ddccf7d743bf9c67b2664231d14f:938e4831d7d547a59fd6d76c3bdfe6b5 (a,b) (votes visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user b321ddccf7d743bf9c67b2664231d14f:b3e407acc97b4911b0de470b1d45a68f (a) (votes visibles connecté ou non) (sondage present dans sondages participes) -vote admin b321ddccf7d743bf9c67b2664231d14f:6f980a4541e04edd9dec95d3dbde0830 (b) (votes visibles connecté ou non) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -by admin user -~~~~~~~~~~~~~ - -admin poll/summrary/7103c6d4a79246699425e99e1f344b98:717ebe61a3b64fcea453c9cba5953149 (peut voter) -vote anonyme 7103c6d4a79246699425e99e1f344b98:ad50a5d406d84aa09e3a02dd9ad0116c (a,b) (vote visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 7103c6d4a79246699425e99e1f344b98:24abe4ba077341b489af505531ac93de (a) (sondage present dans sondages participes) -vote admin 7103c6d4a79246699425e99e1f344b98:2237dbc51f7c4268a8a7e10f6146ae87 (b) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -everybody free poll -------------------- - -by not connected user -~~~~~~~~~~~~~~~~~~~~~ - -admin poll/summrary/2262a31f374e4969bb3593e762c0cae6:659bb046fc06493f9909ca9f34ca6261 (peut voter) -vote anonyme 2262a31f374e4969bb3593e762c0cae6:6909131490ab4a1abae0daaf15129cdb (a,b) (votes visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 2262a31f374e4969bb3593e762c0cae6:f058910736af48e9905f83f3f5de5b8d (a) (sondage present dans sondages participes) -vote admin 2262a31f374e4969bb3593e762c0cae6:2d97c079df054a7c9fc321b2df3488f3 (b) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -by connected user -~~~~~~~~~~~~~~~~~ - -admin poll/summrary/4cd79d032aa7433d9944ec9376c385c0:f26e253004d14547b465b5a414b65a7f (peut voter) -vote anonyme 4cd79d032aa7433d9944ec9376c385c0:307222b5e17442758bd23fc9d8a19f5e (a,b) (votes visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 4cd79d032aa7433d9944ec9376c385c0:8a10f049538142669ca84bb034f7a886 (a) (sondage present dans sondages participes) -vote admin 4cd79d032aa7433d9944ec9376c385c0:6e92bf48f672429ea265a2647bef415d (b) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -by admin user -~~~~~~~~~~~~~ - -admin poll/summrary/3300e59939bd4c9797e360060b8e54be:c370172faf7a4108be0d76630af34c4b (peut voter) -vote anonyme 3300e59939bd4c9797e360060b8e54be:4399e0ff6dbe4544b64861d1e234ee1a (a,b) (sondage present dans sondages participes) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 3300e59939bd4c9797e360060b8e54be:5af1c33357084f89a56d1cde89584cb7 (a) (sondage present dans sondages participes) -vote admin 3300e59939bd4c9797e360060b8e54be:335e6a3921fb4dd5b6220c55311b7931 (b) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) \ No newline at end of file +Pour tester la portée des votes (http://chorem.org/issues/742) \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java 2012-08-28 16:46:52 UTC (rev 3656) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java 2012-08-28 16:58:13 UTC (rev 3657) @@ -1,5 +1,6 @@ package org.chorem.pollen.ui.it; +import org.chorem.pollen.ui.it.freepoll.FreePollTestSuite; import org.chorem.pollen.ui.it.restrictedpoll.RestrictedPollTestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -13,7 +14,7 @@ @RunWith(Suite.class) @Suite.SuiteClasses( { -// FreePollTestSuite.class, + FreePollTestSuite.class, RestrictedPollTestSuite.class, CleanDrivers.class }

1 0

r3656 - trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 18:46:52 +0200 (Tue, 28 Aug 2012) New Revision: 3656 Url: http://chorem.org/repositories/revision/pollen/3656 Log: remove old packages Removed: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/anonymousPoll/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/creatorOnly/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/everybody/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/voterOnly/

1 0

r3655 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 18:38:58 +0200 (Tue, 28 Aug 2012) New Revision: 3655 Url: http://chorem.org/repositories/revision/pollen/3655 Log: refs #717: Restricted and authentication user (creator can vote loggued or not) fixes #795: Can not delete your own vote in anonymous poll (can modify or delete his own vote in anonymous poll) fixes #564: Cannot remove vote (can remove votes except for anonymous poll, only user can do it since creator can not see all votes) refs #746: Improve security model (weak security linked by email for the moment...) 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/SecurityService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 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-08-28 16:32:07 UTC (rev 3654) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-08-28 16:38:58 UTC (rev 3655) @@ -555,7 +555,12 @@ if (StringUtils.isNotEmpty(accountId) || withUserAccount) { - if (poll.isPollFree()) { + if (poll.getCreator().getAccountId().equals(accountId)) { + + // let's use the creator account + pollAccountLoaded = poll.getCreator(); + + } else if (poll.isPollFree()) { try { pollAccountLoaded = dao.findVoterPollAccount(poll.getPollId(), @@ -1034,167 +1039,4 @@ + thumbCopied.length() + ")"); } } - - -// /** -// * Build a new Poll instance with given {@code user} as creator -// * -// * @param user Build a new Poll instance with given {@code user} as creator -// * @return Build a new Poll instance with given {@code user} as creator -// */ -// protected Poll getNewPoll(UserAccount user) { -// -// PollDAO pollDAO = getDAO(Poll.class); -// Poll result = newInstance(pollDAO); -// -// PollenConfiguration configuration = getConfiguration(); -// -// // default values from configuration -// result.setChoiceType(configuration.getDefaultChoiceType()); -// result.setVoteCountingType(configuration.getDefaultVoteCountingType()); -// result.setPollType(configuration.getDefaultPollType()); -// result.setPollVoteVisibility(configuration.getDefaultPollVoteVisibility()); -// result.setPollCommentVisibility(configuration.getDefaultPollCommentVisibility()); -// -// // Initialize creator of the poll -// PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); -// PollAccount creator = newInstance(pollAccountDAO); -// -// if (user != null) { -// -// // Link the creator with the user -// creator.setVotingId(user.getDisplayName()); -// creator.setEmail(user.getEmail()); -// creator.setUserAccount(user); -// } -// result.setCreator(creator); -// -// return result; -// } -// -// /** -// * Obtains a copy of an existing poll given his {@code pollUid}. -// * <p/> -// * If flag {@code clone} is setted to {@code true}, then all id will -// * be removed (pollId, accountId, topiaId). -// * -// * @param pollUid the {@link Poll#getPollId()} of the poll to copy -// * @param userAccount optional incoming user account to link to the -// * {@link Poll#getCreator()} -// * @param clone flag to clone or not the copy of the poll (if setted -// * to {@code true} then all id will be removed). -// * @return the copy of the poll -// * @throws PollNotFoundException if poll was not found -// */ -// protected Poll getNewPollCopy(String pollUid, -// UserAccount userAccount, -// boolean clone) throws PollNotFoundException { -// -// // pollUid can not be blank -// Preconditions.checkState(StringUtils.isNotBlank(pollUid)); -// -// // load for sure existing poll -// Poll poll = getExistingPollByPollId(pollUid); -// -// PollDAO pollDAO = getDAO(Poll.class); -// Poll result = newInstance(pollDAO); -// -// PollenBinderHelper.simpleCopy(poll, result, !clone); -// if (clone) { -// // reset id for clone case -// result.setPollId(null); -// } -// -// // -- Creator -- // -// PollAccount creatorLoaded = poll.getCreator(); -// PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); -// PollAccount creatorEditable = newInstance(pollAccountDAO); -// result.setCreator(creatorEditable); -// -// PollenBinderHelper.simpleCopy(creatorLoaded, creatorEditable, !clone); -// if (clone) { -// // reset id for clone case -// creatorEditable.setAccountId(null); -// } -// -// if (creatorEditable.getUserAccount() == null) { -// // use the incoming userAccount -// creatorEditable.setUserAccount(userAccount); -// } -// -// // -- Choice -- // -// Function<Choice, Choice> choiceCreator = -// PollenServiceFunctions.newChoiceCreator(poll.getChoiceType()); -// Iterable<Choice> choices = -// Iterables.transform(poll.getChoice(), choiceCreator); -// -// for (Choice choiceLoaded : choices) { -// if (clone) { -// // reset id for clone case -// choiceLoaded.setTopiaId(null); -// } -// result.addChoice(choiceLoaded); -// } -// -// // -- VotingList -- // -// VotingListDAO votingListDAO = getDAO(VotingList.class); -// PersonToListDAO personToListDAO = getDAO(PersonToList.class); -// for (VotingList votingListLoaded : poll.getVotingList()) { -// VotingList votingListEditable = newInstance(votingListDAO); -// result.addVotingList(votingListEditable); -// // Do not keep votingLists topiaId, to simplify the update will delete old votingLists and create new ones -// PollenBinderHelper.simpleCopy( -// votingListLoaded, votingListEditable, false); -// -// for (PersonToList personToListLoaded : votingListLoaded.getPollAccountPersonToList()) { -// PersonToList personToListEditable = newInstance(personToListDAO); -// votingListEditable.addPollAccountPersonToList(personToListEditable); -// // Do not keep personToLists topiaId, to simplify the update will delete old personToLists and create new ones -// PollenBinderHelper.simpleCopy( -// personToListLoaded, personToListEditable, false); -// -// PollAccount personLoaded = personToListLoaded.getPollAccount(); -// PollAccount personEditable = newInstance(pollAccountDAO); -// personToListEditable.setPollAccount(personEditable); -// // copy the person, keeping topiaId is useless because we have the link with PersonToList -// PollenBinderHelper.simpleCopy( -// personLoaded, personEditable, false); -// if (clone) { -// // reset id for clone case -// personEditable.setAccountId(null); -// } -// } -// } -// -// // -- PreventRule -- // -// PreventRuleDAO preventRuleDAO = getDAO(PreventRule.class); -// for (PreventRule preventRuleLoaded : poll.getPreventRule()) { -// PreventRule preventRuleEditable = newInstance(preventRuleDAO); -// PollenBinderHelper.simpleCopy( -// preventRuleLoaded, preventRuleEditable, !clone); -// result.addPreventRule(preventRuleEditable); -// } -// -// // Load votes to have the correct size used to check if vote is started -// result.setVote(poll.getVote()); -// -// return result; -// } - -// protected PollAccount copyPollAccount(PollAccount source) { -// PollAccountDAO dao = getDAO(PollAccount.class); -// PollAccount result = newInstance(dao); -// PollenBinderHelper.copy("", source, result, true); -// result.setUserAccount(source.getUserAccount()); -// return result; -// } - -// public PollAccount getNewPollAccount(UserAccount userAccount) { -// PollAccountDAO dao = getDAO(PollAccount.class); -// PollAccount result = newInstance(dao); -// String votingId = userAccount != null ? userAccount.getDisplayName() : ""; -// result.setVotingId(votingId); -// result.setUserAccount(userAccount); -// return result; -// } } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-08-28 16:32:07 UTC (rev 3654) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-08-28 16:38:58 UTC (rev 3655) @@ -192,13 +192,6 @@ return false; } - if (securityContext.isWithAccountId() && - securityContext.getAccountId().equals(poll.getCreator().getAccountId())) { - - // user can not vote with his creator accountId (must use a new one) - return false; - } - if (!poll.isPollFree() && !securityContext.isRestrictedVoter()) { // on none free poll, only restricted user can vote @@ -209,28 +202,6 @@ return true; } - public boolean isCanVoteFromSummary(PollenUserSecurityContext securityContext) { - - Poll poll = securityContext.getPoll(); - - Date now = serviceContext.getCurrentTime(); - - if (!poll.isRunning(now)) { - - // poll is not running, can not vote - return false; - } - - if (!poll.isPollFree() && !securityContext.isRestrictedVoter()) { - - // on none free poll, only restricted user can vote - return false; - } - - // ok can vote - return true; - } - public boolean isCanModifyVote(PollenUserSecurityContext securityContext, String voteId) { @@ -247,12 +218,6 @@ return false; } - if (poll.isAnonymous()) { - - // poll is anonymous, no vote can be modify - return false; - } - Vote vote = poll.getVoteByTopiaId(voteId); if (vote == null) { @@ -276,6 +241,13 @@ // user conntected is the voter return true; } + + if (userConnected.getEmail().equals(votePollAccount.getEmail())) { + + //FIXME-tchemit-2012-08-28 : voir http://chorem.org/issues/796 + // owner linked by email + return true; + } } // can not modify vote in other cases @@ -329,13 +301,6 @@ return false; } - if (poll.isAnonymous()) { - - // poll is anonymous, no vote can be delete (?) FIXME Check this - return false; - } - - Vote vote = poll.getVoteByTopiaId(voteId); if (vote == null) { @@ -365,6 +330,13 @@ // owner of vote (linked by userAccount) can delete his own vote return true; } + + if (userConnected.getEmail().equals(votePollAccount.getEmail())) { + + //FIXME-tchemit-2012-08-28 : voir http://chorem.org/issues/796 + // owner linked by email + return true; + } } // can not modify vote in other cases @@ -429,7 +401,8 @@ result = Lists.newArrayList(); - if (!poll.isAnonymous() && userSecurityContext.isVoter()) { + if (userSecurityContext.isVoter() || + userSecurityContext.isRestrictedVoter()) { // but can still see his own vote @@ -453,6 +426,20 @@ break; } } + + //FIXME-tchemit-2012-08-28 : voir http://chorem.org/issues/796 + // owner linked by email + + if (result.isEmpty()) { + String userAccountEmail = userAccount.getEmail(); + for (Vote vote : allVotes) { + + if (userAccountEmail.equals(vote.getPollAccount().getEmail())) { + result.add(vote); + break; + } + } + } } } @@ -483,6 +470,7 @@ result = true; } else { + //FIXME-tchemit-2012-08-28 : voir http://chorem.org/issues/796 // try to link bo user account email result = ObjectUtils.equals(poll.getCreator().getEmail(), userAccount.getEmail()); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-08-28 16:32:07 UTC (rev 3654) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-08-28 16:38:58 UTC (rev 3655) @@ -41,43 +41,19 @@ import org.chorem.pollen.business.persistence.VoteToChoiceDAO; import org.chorem.pollen.common.PollType; import org.chorem.pollen.entities.PollenBinderHelper; -import org.chorem.pollen.entities.PollenDAOHelper; import org.chorem.pollen.services.PollenServiceSupport; import org.chorem.pollen.services.exceptions.PollAccountNotFound; import org.chorem.pollen.services.exceptions.VoteNotFoundException; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import java.util.List; -import java.util.Map; public class VoteService extends PollenServiceSupport { /** Logger. */ private static final Log log = LogFactory.getLog(VoteService.class); -// public Vote getNewVote(Poll poll, PollAccount account) { -// -// Preconditions.checkNotNull(poll); -// -// VoteDAO voteDAO = getDAO(Vote.class); -// VoteToChoiceDAO voteToChoiceDAO = getDAO(VoteToChoice.class); -// -// Vote result = newInstance(voteDAO); -// result.setPollAccount(account); -// result.setWeight(1.); -// -// // Prepare the List of VoteToChoice with Poll's choices -// for (Choice choice : poll.getChoice()) { -// VoteToChoice element = newInstance(voteToChoiceDAO); -// element.setChoice(choice); -// result.addChoiceVoteToChoice(element); -// } -// -// return result; -// } - public Vote getVoteEditable(Poll poll, PollAccount accountEditable) { Preconditions.checkNotNull(poll); @@ -143,11 +119,17 @@ } // Retrieve weight for Restricted Poll with existing account - if (!poll.isPollFree()&& accountEditable.getTopiaId() != null) { + if (!poll.isPollFree() && accountEditable.getTopiaId() != null) { PersonToListDAO personToListDAO = getDAO(PersonToList.class); PersonToList personToList = personToListDAO.findByPollAndAccount(poll, accountEditable); result.setWeight(personToList.getWeight()); } + + if (poll.isAnonymous()) { + + // force anonymous flag on vote + result.setAnonymous(true); + } return result; } @@ -157,8 +139,10 @@ Vote result = create(voteDAO); result.setWeight(vote.getWeight()); - result.setAnonymous(vote.isAnonymous()); + // make sure vote is anonymous if poll is + result.setAnonymous(vote.isAnonymous() || poll.isAnonymous()); + // -- PollAccount -- // PollAccount pollAccount = vote.getPollAccount(); String pollAccountId = pollAccount.getTopiaId(); @@ -176,20 +160,17 @@ pollAccountLoaded = getEntityById(PollAccount.class, pollAccountId); } - // Update user data if not anonymous - if (!vote.isAnonymous()) { + // Update user data - pollAccountLoaded.setVotingId(pollAccount.getVotingId()); - pollAccountLoaded.setEmail(pollAccount.getEmail()); + pollAccountLoaded.setVotingId(pollAccount.getVotingId()); + pollAccountLoaded.setEmail(pollAccount.getEmail()); - UserAccount userAccount = pollAccount.getUserAccount(); - if (userAccount != null) { - UserAccount userAccountLoaded = - getEntityById(UserAccount.class, userAccount.getTopiaId()); - pollAccountLoaded.setUserAccount(userAccountLoaded); - } + UserAccount userAccount = pollAccount.getUserAccount(); + if (userAccount != null) { + UserAccount userAccountLoaded = + getEntityById(UserAccount.class, userAccount.getTopiaId()); + pollAccountLoaded.setUserAccount(userAccountLoaded); } - // TODO Manage anonymous for existing account ??? problem with restricted and email result.setPollAccount(pollAccountLoaded); // -- List of VoteToChoice -- // @@ -245,17 +226,12 @@ // -- PollAccount -- // PollAccount voteAccount = vote.getPollAccount(); PollAccount pollAccountEntity = result.getPollAccount(); - if (vote.isAnonymous()) { - pollAccountEntity.setVotingId(null); - pollAccountEntity.setEmail(null); - pollAccountEntity.setUserAccount(null); + pollAccountEntity.setVotingId(voteAccount.getVotingId()); + pollAccountEntity.setEmail(voteAccount.getEmail()); + pollAccountEntity.setUserAccount(voteAccount.getUserAccount()); - } else { - pollAccountEntity.setVotingId(voteAccount.getVotingId()); - pollAccountEntity.setEmail(voteAccount.getEmail()); - pollAccountEntity.setUserAccount(voteAccount.getUserAccount()); - } - result.setAnonymous(vote.isAnonymous()); + // make sure vote is anonymous if poll is + result.setAnonymous(vote.isAnonymous() || poll.isAnonymous()); VoteToChoiceDAO voteToChoiceDao = getDAO(VoteToChoice.class); @@ -334,14 +310,16 @@ if (poll.isPollFree()) { - // Delete vote PollAccount if the Poll is free and account is not the creator if (!voteAccount.equals(poll.getCreator())) { + + // Delete vote PollAccount if the Poll is free and account is not the creator PollAccountDAO accountDAO = getDAO(PollAccount.class); delete(accountDAO, voteAccount); } - // Update pollAccount hasVoted flag } else { + + // Update pollAccount hasVoted flag PersonToList personToList = poll.getPersonToListByVote(entityToDelete); personToList.setHasVoted(false); } @@ -398,35 +376,6 @@ } } - public List<Vote> selectVotes(Map<String, Object> properties) { - TopiaContext transaction = getTransaction(); - try { - VoteDAO voteDAO = PollenDAOHelper.getVoteDAO(transaction); - - List<Vote> voteEntities; - - if (properties == null) { - voteEntities = voteDAO.findAll(); - if (log.isWarnEnabled()) { - log.warn("Attention : tous les votes ont été sélectionnés !"); - } - } else { - voteEntities = voteDAO.findAllByProperties(properties); - } - - List<Vote> results = Lists.newArrayList(voteEntities); - - if (log.isDebugEnabled()) { - log.debug("Entities found: " - + ((results == null) ? "null" : results.size())); - } - - return results; - } catch (Exception e) { - throw new PollenTechnicalException("Could not obtain votes", e); - } - } - protected VoteToChoice createVoteToChoice(Vote vote, VoteToChoice source) { VoteToChoiceDAO voteToChoiceDao = getDAO(VoteToChoice.class);

1 0

r3654 - trunk/pollen-services/src/main/java/org/chorem/pollen/bean
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 18:32:07 +0200 (Tue, 28 Aug 2012) New Revision: 3654 Url: http://chorem.org/repositories/revision/pollen/3654 Log: add equals and hashcode method on PollUri Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-08-28 16:31:46 UTC (rev 3653) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-08-28 16:32:07 UTC (rev 3654) @@ -104,4 +104,24 @@ public String toString() { return getUri(); } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof PollUri)) { + return false; + } + + PollUri pollUri = (PollUri) o; + return getUri().equals(pollUri.getUri()); + + } + + @Override + public int hashCode() { + int result = getUri().hashCode(); + return result; + } }

1 0

r3653 - in trunk/pollen-persistence/src: main/java/org/chorem/pollen/business/persistence test/java/org/chorem/pollen/business/persistence
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 18:31:46 +0200 (Tue, 28 Aug 2012) New Revision: 3653 Url: http://chorem.org/repositories/revision/pollen/3653 Log: avoid logic in DAO, poll anonymous must not be used to obtain votes from db... Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-08-28 16:30:53 UTC (rev 3652) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-08-28 16:31:46 UTC (rev 3653) @@ -23,7 +23,6 @@ package org.chorem.pollen.business.persistence; import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -34,22 +33,15 @@ public List<E> findAllVotes(Poll poll) throws TopiaException { Preconditions.checkNotNull(poll); - List<E> results; - // No need to load votes for an anonymous poll - if (poll.isAnonymous()) { + String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + + "p = :p AND " + + "e IN ELEMENTS(p.vote) " + + "ORDER BY e.topiaCreateDate DESC"; - results = Lists.newArrayList(); - } else { + List<E> result = findAllByQuery(hql, "p", poll); - String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + - "p = :p AND " + - "e IN ELEMENTS(p.vote) " + - "ORDER BY e.topiaCreateDate DESC"; - - results = findAllByQuery(hql, "p", poll); - } - return results; + return result; } public List<E> findAllVotesByPoll(Poll poll, @@ -58,28 +50,19 @@ Preconditions.checkNotNull(poll); Preconditions.checkNotNull(pager); - List<E> results; + String countHql = "SELECT COUNT(e) FROM " + + "VoteImpl e, PollImpl p WHERE " + + "p = :p AND e IN ELEMENTS(p.vote)"; - // No need to load votes for an anonymous poll - if (poll.isAnonymous()) { + computeAndAddRecordsToPager(countHql, pager, "p", poll); - results = Lists.newArrayList(); - } else { + String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + + "p = :p AND " + + "e IN ELEMENTS(p.vote) " + + "ORDER BY e.topiaCreateDate DESC"; - String countHql = "SELECT COUNT(e) FROM " + - "VoteImpl e, PollImpl p WHERE " + - "p = :p AND e IN ELEMENTS(p.vote)"; - - computeAndAddRecordsToPager(countHql, pager, "p", poll); - - String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + - "p = :p AND " + - "e IN ELEMENTS(p.vote) " + - "ORDER BY e.topiaCreateDate DESC"; - - results = findAllByQueryAndPager(hql, pager, "p", poll); - } - return results; + List<E> result = findAllByQueryAndPager(hql, pager, "p", poll); + return result; } public boolean hasAlreadyVoted(Poll poll, String votingId) throws TopiaException { Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-08-28 16:30:53 UTC (rev 3652) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-08-28 16:31:46 UTC (rev 3653) @@ -49,7 +49,8 @@ Poll poll1 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId1"); Poll poll2 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId2", - Poll.PROPERTY_POLL_VOTE_VISIBILITY, PollVoteVisibility.NOBODY); + Poll.PROPERTY_POLL_VOTE_VISIBILITY, + PollVoteVisibility.NOBODY); Vote vote1 = voteDAO.create(); vote1.setTopiaCreateDate(DateUtil.createDate(0, 0, 0, 1, 1, 2010)); @@ -76,7 +77,8 @@ actual = voteDAO.findAllVotes(poll2); Assert.assertNotNull(actual); - Assert.assertTrue(actual.isEmpty()); + Assert.assertEquals(1, actual.size()); + Assert.assertEquals(vote3, actual.get(0)); } @Test @@ -89,7 +91,8 @@ Poll poll1 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId1"); Poll poll2 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId2", - Poll.PROPERTY_POLL_VOTE_VISIBILITY, PollVoteVisibility.NOBODY); + Poll.PROPERTY_POLL_VOTE_VISIBILITY, + PollVoteVisibility.NOBODY); Vote vote1 = voteDAO.create(); vote1.setTopiaCreateDate(DateUtil.createDate(0, 0, 0, 1, 1, 2010)); @@ -120,7 +123,8 @@ actual = voteDAO.findAllVotesByPoll(poll2, pager); Assert.assertNotNull(actual); - Assert.assertTrue(actual.isEmpty()); + Assert.assertEquals(1, actual.size()); + Assert.assertEquals(vote3, actual.get(0)); } @Test @@ -134,7 +138,8 @@ Poll poll1 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId1"); Poll poll2 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId2", - Poll.PROPERTY_POLL_VOTE_VISIBILITY, PollVoteVisibility.NOBODY); + Poll.PROPERTY_POLL_VOTE_VISIBILITY, + PollVoteVisibility.NOBODY); String votingId1 = "votingId1"; String votingId2 = "votingId2";

1 0

r3652 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 18:30:53 +0200 (Tue, 28 Aug 2012) New Revision: 3652 Url: http://chorem.org/repositories/revision/pollen/3652 Log: creator can now vote as a normal user + change log levels and comment dummy code Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java 2012-08-28 16:29:38 UTC (rev 3651) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java 2012-08-28 16:30:53 UTC (rev 3652) @@ -294,6 +294,8 @@ getUserSecurityContext().isAdmin(); } + //FIXME-tchemit-2012-08-27, why ? in none free poll can not see votingId ? + //FIXME-tchemit-2012-08-27 ...hum weird, just in anonymous vote (method will be removed after check...) public boolean isAccountFieldDisplayed() { return !poll.isAnonymous() || isRestrictedPoll() || isGroupPoll(); } @@ -469,17 +471,17 @@ feedFileExisting = getPollFeedService().isFeedExists(poll); - if (log.isInfoEnabled()) { + if (log.isDebugEnabled()) { Date now = serviceContext.getCurrentTime(); - log.info("pollChoiceOrVoteStarted = " + isPollChoiceOrVoteStarted()); - log.info("pollChoiceRunning = " + isPollChoiceRunning()); - log.info("pollRunning = " + poll.isRunning(now)); - log.info("accountFieldDisplayed = " + isAccountFieldDisplayed()); - log.info("creatorOrAdminUser = " + isCreatorOrAdmin()); - log.info("isVoteAllowed = " + isVoteAllowed()); - log.info("isCommentAllowed = " + isCommentAllowed()); - log.info("isResultAllowed = " + isResultAllowed()); - log.info("pollVoteVisibility = " + poll.getPollVoteVisibility()); + log.debug("pollChoiceOrVoteStarted = " + isPollChoiceOrVoteStarted()); + log.debug("pollChoiceRunning = " + isPollChoiceRunning()); + log.debug("pollRunning = " + poll.isRunning(now)); +// log.info("accountFieldDisplayed = " + isAccountFieldDisplayed()); + log.debug("creatorOrAdminUser = " + isCreatorOrAdmin()); + log.debug("isVoteAllowed = " + isVoteAllowed()); + log.debug("isCommentAllowed = " + isCommentAllowed()); + log.debug("isResultAllowed = " + isResultAllowed()); + log.debug("pollVoteVisibility = " + poll.getPollVoteVisibility()); } return INPUT; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-08-28 16:29:38 UTC (rev 3651) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-08-28 16:30:53 UTC (rev 3652) @@ -27,7 +27,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.PollenUserSecurityContext; import org.chorem.pollen.bean.PollUrl; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; @@ -64,8 +63,6 @@ // Messages Poll poll = getPoll(); - PollenUserSecurityContext securityContext = getUserSecurityContext(); - if (poll.isClosed()) { addFlashWarning(_("pollen.information.pollClosed")); } else if (!isPollStarted()) { @@ -74,18 +71,7 @@ addFlashWarning(_("pollen.information.pollFinished")); } else if (!isVoteAllowed()) { - // check crator does not try to vote with his creator id - if (securityContext.isCreator() && securityContext.isWithAccountId()) { - - if (poll.getCreator().getAccountId().equals(securityContext.getAccountId())) { - - // only participant can see votes - addFlashWarning(_("pollen.information.canNotvotewithCreatorAccountId")); - } - } else { - addFlashWarning(_("pollen.information.pollCanNotVote")); - } } if (isPollChoiceRunning()) { @@ -240,7 +226,7 @@ } else { - // there is a aacountId in url, just inform vote is saved + // there is a accountId in url, just inform vote is saved addFlashMessage(_("pollen.information.vote.created")); }

1 0

r3651 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 18:29:38 +0200 (Tue, 28 Aug 2012) New Revision: 3651 Url: http://chorem.org/repositories/revision/pollen/3651 Log: forbid to change email after account is created Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-08-28 16:29:02 UTC (rev 3650) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-08-28 16:29:38 UTC (rev 3651) @@ -99,12 +99,15 @@ } } - if (StringUtils.isBlank(pollenUserAccount.getEmail())) { - addFieldError("pollenUserAccount.email", - _("pollen.error.email.required")); - } else if (!StringUtil.isEmail(pollenUserAccount.getEmail())) { - addFieldError("pollenUserAccount.email", - _("pollen.error.email.invalid")); + // can only change email (for the moment at create time not after) + if (!isExists()) { + if (StringUtils.isBlank(pollenUserAccount.getEmail())) { + addFieldError("pollenUserAccount.email", + _("pollen.error.email.required")); + } else if (!StringUtil.isEmail(pollenUserAccount.getEmail())) { + addFieldError("pollenUserAccount.email", + _("pollen.error.email.invalid")); + } } }

1 0

r3650 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 18:29:02 +0200 (Tue, 28 Aug 2012) New Revision: 3650 Url: http://chorem.org/repositories/revision/pollen/3650 Log: remove all logic code from jsp :( Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-08-28 16:28:18 UTC (rev 3649) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-08-28 16:29:02 UTC (rev 3650) @@ -177,20 +177,20 @@ <s:form id="voteForm" validate="true"> <s:hidden key="pollUri" label=''/> -<s:if test="poll.anonymous"> - <s:hidden key="vote.anonymous" label="" value='true'/> -</s:if> +<%--<s:if test="poll.anonymous">--%> + <%--<s:hidden key="vote.anonymous" label="" value='true'/>--%> +<%--</s:if>--%> <table id="poll"> <thead> <tr> - <s:if test="accountFieldDisplayed"> + <%--<s:if test="accountFieldDisplayed">--%> <th style="width:200px;"> <s:text name="pollen.common.voterName"/> </th> - </s:if> - <s:else> - <th></th> - </s:else> + <%--</s:if>--%> + <%--<s:else>--%> + <%--<th></th>--%> + <%--</s:else>--%> <s:if test="textType"> <s:iterator value="poll.choice" var="choice"> <s:if test="!isChoiceHidden(#choice)"> @@ -285,14 +285,14 @@ <s:if test="voteAllowed"> <tfoot> <tr> - <s:if test="accountFieldDisplayed"> + <s:if test="vote.anonymous"> + <th>?</th> + </s:if> + <s:else> <th id="voterName"> <s:textfield key='pollAccount.votingId' required="true" label='' value="%{pollAccount.votingId}" theme="simple"/> </th> - </s:if> - <s:else> - <th></th> </s:else> <s:set name="template" value="%{choiceFragment}"/> <s:iterator value="poll.choice" var="choice" status="status"> @@ -307,18 +307,18 @@ </tfoot> </s:if> <tbody> -<s:if test="!poll.anonymous"> +<%--s:if test="!poll.anonymous"--%> <s:iterator value="votes" var="vote"> <tr id='vote_<s:property value="%{#vote.pollAccount.accountId}"/>'> <td> - <s:if test="accountFieldDisplayed"> - <s:if test="!#vote.anonymous"> - <s:property value="pollAccount.votingId"/> + <%--<s:if test="accountFieldDisplayed">--%> + <s:if test="vote.anonymous"> + ? </s:if> <s:else> - ? + <s:property value="pollAccount.votingId"/> </s:else> - </s:if> + <%--</s:if>--%> <s:if test="isModifyVoteAllowed(#vote)"> <s:a action="votefor/%{poll.pollId}:%{#vote.pollAccount.accountId}" namespace="/poll" id='modifyVote_%{#vote.pollAccount.accountId}'> @@ -341,10 +341,10 @@ <s:if test="!isChoiceHidden(#choice)"> <s:set name="currentVoteChoice" value="%{#vote.getChoiceVoteToChoice(#choice)}"/> - <s:if test="poll.anonymous"> + <%--s:if test="poll.anonymous"> <td class="anonymous">?</td> </s:if> - <s:else> + <s:else--%> <s:if test="isChoiceInVote(#currentVoteChoice)"> <td class="voted"> <s:property value="%{getChoiceValue(#currentVoteChoice)}"/> @@ -353,12 +353,12 @@ <s:else> <td class="notVoted"></td> </s:else> - </s:else> + <%--</s:else>--%> </s:if> </s:iterator> </tr> </s:iterator> -</s:if> +<%--</s:if>--%> <s:if test="resultAllowed"> <tr> <td>

1 0