Author: tchemit Date: 2012-08-24 17:46:34 +0200 (Fri, 24 Aug 2012) New Revision: 3626 Url: http://chorem.org/repositories/revision/pollen/3626 Log: refs #742: Option to allow all users to show voting of others users (all tests are ok) + fix some vote page stuff Added: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/075ab18c50c74f83b894c042bba84ff5.xml trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/2262a31f374e4969bb3593e762c0cae6.xml trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/3300e59939bd4c9797e360060b8e54be.xml trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/4cd79d032aa7433d9944ec9376c385c0.xml trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/7103c6d4a79246699425e99e1f344b98.xml trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/8518ede7bf1247d2ba0dfe222575c5ba.xml trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/a04bd349d8964c4fad48ac6ececc60a0.xml trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/b321ddccf7d743bf9c67b2664231d14f.xml trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/e61a350a1d714e479aad526ee85b7bc6.xml 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 trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/css/vote.css trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/README.txt trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/db/pollendb.h2.db 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-23 23:05:40 UTC (rev 3625) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java 2012-08-24 15:46:34 UTC (rev 3626) @@ -180,6 +180,18 @@ return result; } + public String getPollVoteVisibilityName() { + PollVoteVisibility strategy = getPoll().getPollVoteVisibility(); + String result = _(strategy.getI18nKey()); + return result; + } + + public String getPollVoteVisibilityHelp() { + PollVoteVisibility strategy = getPoll().getPollVoteVisibility(); + String result = _(strategy.getI18nHelpKey()); + return result; + } + /** * Is comment can be displayed (and then added) on this poll. * 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-23 23:05:40 UTC (rev 3625) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-08-24 15:46:34 UTC (rev 3626) @@ -31,12 +31,13 @@ import org.chorem.pollen.bean.PollUrl; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; -import org.chorem.pollen.business.persistence.PollVoteVisibility; import org.chorem.pollen.business.persistence.Vote; import org.chorem.pollen.business.persistence.VoteToChoice; import org.chorem.pollen.services.impl.VoteService; import org.chorem.pollen.votecounting.strategy.VoteCountingStrategy; +import static org.nuiton.i18n.I18n.n_; + /** * Votes to a poll. * @@ -87,37 +88,6 @@ } } - if (isVoteAllowed()) { - - PollVoteVisibility voteVisibility = poll.getPollVoteVisibility(); - switch (voteVisibility) { - - case NOBODY: - // anonymous poll (nobody can see votes) - addFlashWarning(_("pollen.information.voteNotVisible.anonymousPoll")); - break; - case CREATOR_ONLY: - if (!securityContext.isAdmin()) { - - // only creator can see votes - addFlashWarning(_("pollen.information.voteNotVisible.onlyCreator")); - } - break; - case PARTICIPANT_ONLY: - if (!securityContext.isVoter() || securityContext.isRestrictedVoter()) { - - // only participant can see votes - addFlashWarning(_("pollen.information.voteNotVisible.onlyParticipant")); - } - break; - case EVERYBODY: - // free to everybody - break; - } - } else { - - - } if (isPollChoiceRunning()) { addFlashMessage(_("pollen.information.pollChoiceRunning")); } @@ -224,31 +194,31 @@ VoteService voteService = getVoteService(); - Vote newVote; - if (StringUtils.isBlank(vote.getTopiaId())) { + boolean newVote = StringUtils.isBlank(vote.getTopiaId()); + Vote savedVote; + if (newVote) { + // create a new vote - newVote = voteService.createVote(poll, vote); + savedVote = voteService.createVote(poll, vote); } else { // update existing vote - newVote = voteService.updateVote(poll, vote); + savedVote = voteService.updateVote(poll, vote); } - //TODO tchemit-2012-05-18 Why clean messages and just messages here ? clearFlashMessages(); - // For free Poll, display the update Url (useless if user is logged or - // not using a modify url) - if (poll.isPollFree() && - (!isUserLoggued() || vote.isAnonymous()) && - StringUtils.isBlank(getUserSecurityContext().getAccountId())) { + if (StringUtils.isBlank(getUserSecurityContext().getAccountId())) { + // no accountId in url, always propose it (for connected + // user to be able to bookmark their votes) + String pollId = poll.getPollId(); - String accountId = newVote.getPollAccount().getAccountId(); + String accountId = savedVote.getPollAccount().getAccountId(); PollUrl updateUrl = getPollUrlService().getPollVoteUrl( - poll, newVote.getPollAccount()); + poll, savedVote.getPollAccount()); if (log.isDebugEnabled()) { log.debug(String.format( @@ -256,13 +226,24 @@ pollId, accountId, updateUrl)); } - addFlashMessage( - _("pollen.information.vote.createdWithUpdateUrl", updateUrl)); + String message; + boolean connected = getUserSecurityContext().isConnected(); + + if (connected) { + message = n_("pollen.information.vote.createdWithUpdateUrl.notConnected"); + } else { + message = n_("pollen.information.vote.createdWithUpdateUrl"); + } + + addFlashMessage(_(message, updateUrl)); + } else { + // there is a aacountId in url, just inform vote is saved addFlashMessage(_("pollen.information.vote.created")); } + return SUCCESS; } } Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-08-23 23:05:40 UTC (rev 3625) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-08-24 15:46:34 UTC (rev 3626) @@ -142,6 +142,7 @@ pollen.common.pollOption.reminderHourCountdown=Hours before end pollen.common.pollType=Who can vote ? pollen.common.pollType.help=Free\: accessible to everyone <br/><br/> Restricted\: accessible only to a list of persons <br/><br/> Group\: accessible to several lists of persons +pollen.common.pollVoteVisibility=Vote visibility pollen.common.postDate=Comment date pollen.common.resultAction=Count pollen.common.results=Results\: @@ -302,6 +303,7 @@ pollen.information.user.updated=User '<strong>%s</strong>' updated. pollen.information.vote.created=Vote saved pollen.information.vote.createdWithUpdateUrl=Vote saved, you can modify it using this address\: <br/> <a href\="%1$s">%1$s</a> +pollen.information.vote.createdWithUpdateUrl.notConnected=Vote saved, you can modify it using this address when you are not connected\: <br/> <a href\="%1$s">%1$s</a> pollen.information.vote.creatorUser=You are identified as the poll's creator. You can't vote with this URL. pollen.information.vote.deleted=Vote deleted. pollen.information.voteNotVisible.anonymousPoll=Votes are not visible\: Anonymous poll Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-08-23 23:05:40 UTC (rev 3625) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-08-24 15:46:34 UTC (rev 3626) @@ -142,6 +142,7 @@ pollen.common.pollOption.reminderHourCountdown=heures avant la fin du sondage pollen.common.pollType=Qui peut voter ? pollen.common.pollType.help=Libre \: accessible à tout le monde <br/><br/> Restreint \: accessible uniquement à une liste de votants <br/><br/> Groupe \: accessible à plusieurs listes de votants +pollen.common.pollVoteVisibility=Visibilité des votes pollen.common.postDate=Date du commentaire pollen.common.resultAction=Dépouillement pollen.common.results=Résultats \: @@ -303,6 +304,7 @@ pollen.information.user.updated=Utilisateur '<strong>%s</strong>' a été mis à jour. pollen.information.vote.created=Vote enregistré pollen.information.vote.createdWithUpdateUrl=Vote enregistré, vous pourrez le modifier à l'adresse suivante \: <br/> <a href\="%1$s">%1$s</a> +pollen.information.vote.createdWithUpdateUrl.notConnected=Vote enregistré, vous pourrez le modifier à l'adresse suivante (lorsque vous n'êtes pas connecté) \: <br/> <a href\="%1$s">%1$s</a> pollen.information.vote.creatorUser=Vous êtes identifié comme le créateur du sondage. Vous ne pouvez pas voter avec cette URL. pollen.information.vote.deleted=Vote supprimé. pollen.information.voteNotVisible.anonymousPoll=Votes non visibles \: Sondage anonyme 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-23 23:05:40 UTC (rev 3625) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-08-24 15:46:34 UTC (rev 3626) @@ -148,6 +148,10 @@ key='pollen.common.voteCountingType' tooltip="%{voteCountingTypeHelp}" tooltipIconPath="/img/tooltip.png"/> + <s:label value="%{pollVoteVisibilityName}" + key='pollen.common.pollVoteVisibility' + tooltip="%{pollVoteVisibilityHelp}" + tooltipIconPath="/img/tooltip.png"/> </fieldset> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/css/vote.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-08-23 23:05:40 UTC (rev 3625) +++ trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-08-24 15:46:34 UTC (rev 3626) @@ -32,7 +32,7 @@ } #pollTop fieldset { - width: 350px; + width: 400px; border: 1px solid #aab; padding: 15px; padding-bottom: 10px; Modified: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/README.txt =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/README.txt 2012-08-23 23:05:40 UTC (rev 3625) +++ trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/README.txt 2012-08-24 15:46:34 UTC (rev 3626) @@ -1,8 +1,8 @@ -================ -PollVoteVibility -================ +================== +PollVoteVisibility +================== -Pour tester la portée des votes (http://chorem.org/issues/742) +Pour tester la portée des votes (http://chorem.org/issues/742). anonymous free poll ------------------- @@ -10,28 +10,141 @@ by not connected user ~~~~~~~~~~~~~~~~~~~~~ -admin cacb52f4d49047b7a7aa24ec528fcc87:e814ba6e25174d5983ad796c400520f5 (peut voter) -vote anonyme cacb52f4d49047b7a7aa24ec528fcc87:56acbf87f3c049c2adc757ef1da88ee1 (a,b) -vote creator (interdit) -vote user cacb52f4d49047b7a7aa24ec528fcc87:c54a12ffde5d44a4ad9e609aa644fc80 (a) (sondage non present dans sondages participes) -vote admin cacb52f4d49047b7a7aa24ec528fcc87:15500943e49842c88d6ceeefaa62e2ed (b) (sondage non present dans sondages participes) +admin 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 fdd43f4c8d614a9aa48047804583508a:9a8e8523f1ba404f8fde45d1844c59ac (peut voter) -vote anonyme fdd43f4c8d614a9aa48047804583508a:07dc154dce514d368441eaa9f27d21e0 (a,b) -vote creator (interdit connecté ou pas) -vote user fdd43f4c8d614a9aa48047804583508a:e67a14d729c7440ebe4a55d589cba515 (a) (sondage non present dans sondages participes) -vote admin fdd43f4c8d614a9aa48047804583508a:29993520034a41168def96f908d2696b (b) (sondage non present dans sondages participes) +admin 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 87cb5b1529374ac0b8c6b7f0b98e169c:65a3caf0bf204226bfcd259c69e56ca8 (peut voter) -vote anonyme 87cb5b1529374ac0b8c6b7f0b98e169c:a0ff6892a28b4a65809b16cd8903245e (a,b) -vote creator (interdit connecté ou pas) -vote user 87cb5b1529374ac0b8c6b7f0b98e169c:fd47e01378354fcaa220a4ffd0974417 (a) (sondage non present dans sondages participes) -vote admin 87cb5b1529374ac0b8c6b7f0b98e169c:010f05042ff3485c834d1ecdc4d17f1e (b) (sondage non present dans sondages participes) +admin 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 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 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 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 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 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 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 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 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 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 Modified: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/db/pollendb.h2.db =================================================================== (Binary files differ) Added: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/075ab18c50c74f83b894c042bba84ff5.xml =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/075ab18c50c74f83b894c042bba84ff5.xml (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/075ab18c50c74f83b894c042bba84ff5.xml 2012-08-24 15:46:34 UTC (rev 3626) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyCreator free poll (by conntected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <subtitle>sondage libre dont les votes ne sont visibles que par le créateur ou un administrateur (crée par un utilisateur connecté)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5</id> + <updated>2012-08-24T09:22:00Z</updated> + <published>2012-08-24T09:22:00Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:22:00Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connecter'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5</id> + <updated>2012-08-24T09:23:34Z</updated> + <published>2012-08-24T09:23:34Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T09:23:34Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5</id> + <updated>2012-08-24T09:25:15Z</updated> + <published>2012-08-24T09:25:15Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T09:25:15Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5</id> + <updated>2012-08-24T09:25:43Z</updated> + <published>2012-08-24T09:25:43Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T09:25:43Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5</id> + <updated>2012-08-24T09:27:46Z</updated> + <published>2012-08-24T09:27:46Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:creator /> + <dc:date>2012-08-24T09:27:46Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user2@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <updated>2012-08-24T09:33:30Z</updated> + <published>2012-08-24T09:33:30Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T09:33:30Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/075ab18c50c74f83b894c042bba84ff5.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/2262a31f374e4969bb3593e762c0cae6.xml =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/2262a31f374e4969bb3593e762c0cae6.xml (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/2262a31f374e4969bb3593e762c0cae6.xml 2012-08-24 15:46:34 UTC (rev 3626) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : everybody free poll (by not connected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <subtitle>sondage libre dont les votes sont visibles par tous (crée par un utilisateur non connecté)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6</id> + <updated>2012-08-24T09:53:11Z</updated> + <published>2012-08-24T09:53:11Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:53:11Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6</id> + <updated>2012-08-24T12:18:52Z</updated> + <published>2012-08-24T12:18:52Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:18:52Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6</id> + <updated>2012-08-24T12:20:02Z</updated> + <published>2012-08-24T12:20:02Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:20:02Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6</id> + <updated>2012-08-24T12:24:43Z</updated> + <published>2012-08-24T12:24:43Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:24:43Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <author> + <name /> + </author> + <updated>2012-08-24T12:25:10Z</updated> + <published>2012-08-24T12:25:10Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T12:25:10Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/2262a31f374e4969bb3593e762c0cae6.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/3300e59939bd4c9797e360060b8e54be.xml =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/3300e59939bd4c9797e360060b8e54be.xml (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/3300e59939bd4c9797e360060b8e54be.xml 2012-08-24 15:46:34 UTC (rev 3626) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : everybody free poll (by admin user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be" /> + <subtitle>sondage libre dont les votes sont visibles par tous (crée par un administrateur)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be</id> + <updated>2012-08-24T09:52:27Z</updated> + <published>2012-08-24T09:52:27Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:52:27Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be</id> + <updated>2012-08-24T13:28:22Z</updated> + <published>2012-08-24T13:28:22Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T13:28:22Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be</id> + <updated>2012-08-24T13:29:19Z</updated> + <published>2012-08-24T13:29:19Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T13:29:19Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be" /> + <author> + <name /> + </author> + <updated>2012-08-24T13:30:31Z</updated> + <published>2012-08-24T13:30:31Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T13:30:31Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/3300e59939bd4c9797e360060b8e54be.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/4cd79d032aa7433d9944ec9376c385c0.xml =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/4cd79d032aa7433d9944ec9376c385c0.xml (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/4cd79d032aa7433d9944ec9376c385c0.xml 2012-08-24 15:46:34 UTC (rev 3626) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : everybody free poll (by connected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0" /> + <subtitle>sondage libre dont les votes sont visibles par tous (crée par un utilisateur connecté)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0</id> + <updated>2012-08-24T09:53:59Z</updated> + <published>2012-08-24T09:53:59Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:53:59Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0</id> + <updated>2012-08-24T12:36:22Z</updated> + <published>2012-08-24T12:36:22Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:36:22Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0</id> + <updated>2012-08-24T13:12:31Z</updated> + <published>2012-08-24T13:12:31Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T13:12:31Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0" /> + <author> + <name /> + </author> + <updated>2012-08-24T13:24:53Z</updated> + <published>2012-08-24T13:24:53Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T13:24:53Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/4cd79d032aa7433d9944ec9376c385c0.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/7103c6d4a79246699425e99e1f344b98.xml =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/7103c6d4a79246699425e99e1f344b98.xml (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/7103c6d4a79246699425e99e1f344b98.xml 2012-08-24 15:46:34 UTC (rev 3626) @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyVoter free poll (by admin user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <subtitle>sondage libre dont les votes ne sont visibles que par les participants, créateurs et admin (crée par un administrateur)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T09:51:17Z</updated> + <published>2012-08-24T09:51:17Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:51:17Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T11:07:26Z</updated> + <published>2012-08-24T11:07:26Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T11:07:26Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T11:09:10Z</updated> + <published>2012-08-24T11:09:10Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T11:09:10Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T11:10:31Z</updated> + <published>2012-08-24T11:10:31Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:creator /> + <dc:date>2012-08-24T11:10:31Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T11:12:33Z</updated> + <published>2012-08-24T11:12:33Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T11:12:33Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T11:15:22Z</updated> + <published>2012-08-24T11:15:22Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:creator /> + <dc:date>2012-08-24T11:15:22Z</dc:date> + </entry> + <entry> + <title>Delete vote of 'not connected' for reason ''</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T12:16:02Z</updated> + <published>2012-08-24T12:16:02Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:16:02Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <updated>2012-08-24T12:17:13Z</updated> + <published>2012-08-24T12:17:13Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T12:17:13Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/7103c6d4a79246699425e99e1f344b98.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/8518ede7bf1247d2ba0dfe222575c5ba.xml =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/8518ede7bf1247d2ba0dfe222575c5ba.xml (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/8518ede7bf1247d2ba0dfe222575c5ba.xml 2012-08-24 15:46:34 UTC (rev 3626) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyVoter free poll (by admin user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba" /> + <subtitle>sondage libre dont les votes ne sont visibles que par les participants, créateurs et admin</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba</id> + <updated>2012-08-24T09:48:47Z</updated> + <published>2012-08-24T09:48:47Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:48:47Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba</id> + <updated>2012-08-24T10:13:26Z</updated> + <published>2012-08-24T10:13:26Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T10:13:26Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba</id> + <updated>2012-08-24T11:02:46Z</updated> + <published>2012-08-24T11:02:46Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T11:02:46Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba" /> + <author> + <name /> + </author> + <updated>2012-08-24T11:05:11Z</updated> + <published>2012-08-24T11:05:11Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T11:05:11Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/8518ede7bf1247d2ba0dfe222575c5ba.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/a04bd349d8964c4fad48ac6ececc60a0.xml =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/a04bd349d8964c4fad48ac6ececc60a0.xml (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/a04bd349d8964c4fad48ac6ececc60a0.xml 2012-08-24 15:46:34 UTC (rev 3626) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyCreator free poll (by admin user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0" /> + <subtitle>sondage libre dont les votes ne sont visibles que par le créateur ou un administrateur (crée par un administrateur)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0</id> + <updated>2012-08-24T09:36:06Z</updated> + <published>2012-08-24T09:36:06Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:36:06Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0</id> + <updated>2012-08-24T09:37:01Z</updated> + <published>2012-08-24T09:37:01Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T09:37:01Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0</id> + <updated>2012-08-24T09:38:20Z</updated> + <published>2012-08-24T09:38:20Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T09:38:20Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0" /> + <author> + <name /> + </author> + <updated>2012-08-24T09:40:27Z</updated> + <published>2012-08-24T09:40:27Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T09:40:27Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/a04bd349d8964c4fad48ac6ececc60a0.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/b321ddccf7d743bf9c67b2664231d14f.xml =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/b321ddccf7d743bf9c67b2664231d14f.xml (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/b321ddccf7d743bf9c67b2664231d14f.xml 2012-08-24 15:46:34 UTC (rev 3626) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyVoter free poll (by connected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <subtitle>sondage libre dont les votes ne sont visibles que par les participants, créateurs et admin (crée par un utilisateur connecté)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f</id> + <updated>2012-08-24T09:50:21Z</updated> + <published>2012-08-24T09:50:21Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:50:21Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f</id> + <updated>2012-08-24T12:27:30Z</updated> + <published>2012-08-24T12:27:30Z</published> + <summary type="text">Poll result: a=0, b=0</summary> + <dc:creator /> + <dc:date>2012-08-24T12:27:30Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f</id> + <updated>2012-08-24T12:29:20Z</updated> + <published>2012-08-24T12:29:20Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:29:20Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f</id> + <updated>2012-08-24T12:29:26Z</updated> + <published>2012-08-24T12:29:26Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:29:26Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f</id> + <updated>2012-08-24T12:31:23Z</updated> + <published>2012-08-24T12:31:23Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:31:23Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <updated>2012-08-24T12:34:12Z</updated> + <published>2012-08-24T12:34:12Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T12:34:12Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/b321ddccf7d743bf9c67b2664231d14f.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/e61a350a1d714e479aad526ee85b7bc6.xml =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/e61a350a1d714e479aad526ee85b7bc6.xml (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/e61a350a1d714e479aad526ee85b7bc6.xml 2012-08-24 15:46:34 UTC (rev 3626) @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyCreator free poll (by not conntected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <subtitle>sondage libre dont les votes ne sont visibles que par le créateur ou un administrateur</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:28:00Z</updated> + <published>2012-08-24T08:28:00Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T08:28:00Z</dc:date> + </entry> + <entry> + <title>New vote from 'anonymous vote'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:33:09Z</updated> + <published>2012-08-24T08:33:09Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T08:33:09Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:42:02Z</updated> + <published>2012-08-24T08:42:02Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T08:42:02Z</dc:date> + </entry> + <entry> + <title>Delete vote of 'chemit+user@codelutin.com' for reason ''</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:48:37Z</updated> + <published>2012-08-24T08:48:37Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T08:48:37Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:50:58Z</updated> + <published>2012-08-24T08:50:58Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T08:50:58Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:54:08Z</updated> + <published>2012-08-24T08:54:08Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T08:54:08Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <updated>2012-08-24T08:54:45Z</updated> + <published>2012-08-24T08:54:45Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T08:54:45Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/feeds/e61a350a1d714e479aad526ee85b7bc6.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native