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

r3480 - in trunk: doc src/site src/site/rst
by tchemit＠users.chorem.org 15 Jun '12

15 Jun '12

Author: tchemit Date: 2012-06-15 17:09:26 +0200 (Fri, 15 Jun 2012) New Revision: 3480 Url: http://chorem.org/repositories/revision/pollen/3480 Log: add some tech docs Added: trunk/src/site/rst/security.rst trunk/src/site/rst/tests.rst Removed: trunk/doc/tests.rst Modified: trunk/src/site/site_en.xml Deleted: trunk/doc/tests.rst =================================================================== --- trunk/doc/tests.rst 2012-06-15 14:45:42 UTC (rev 3479) +++ trunk/doc/tests.rst 2012-06-15 15:09:26 UTC (rev 3480) @@ -1,119 +0,0 @@ -~~~~~~~~~~ -Tests d'UI -~~~~~~~~~~ - -Abstract -======== - -- Tests Pollen by ui. -- Needs a db with - - 1 admin user *admin/admin* - - 1 none admin user *user/user* - - 1 none admin user *user2/user2* - - 1 poll of each votecounting type (Normal, pourcentage, Condorcet, Nombre) + some votes on it - - 1 poll with restricted mode - -Scenarii -======== - -Security --------- - -- authentication avec mauvais login/password (KO) -- authentication avec bon login/password (OK) - -- access aux pages connectés en mode déconnecté (KO) -- access aux pages connectés en mode connecté (OK) - -- access aux pages admin en mode déconnecté (KO) -- access aux pages admin avec un user non admin (KO) -- access aux pages admin avec un user admin (OK) - -- access aux pages d'un sondage avec un mauvais pollId (KO) -- access aux pages d'un sondage avec un bon pollId (OK) - -- access aux pages d'un sondage en mode créateur - - en mode admin (pas de accountId dans l'url) : avec un user non admin (KO) - - en mode admin (pas de accountId dans l'url) : avec un admin (OK) - - en mode créateur (avec mauvais accountId dans l'url) (KO) - - en mode créateur (avec bon accountId dans l'url) (OK) - -- access aux résultats d'un sondage (non restreint) (OK) -- access aux résultats d'un sondage restreint en anonyme (KO) -- access aux résultats d'un sondage restreint en extérieur (mauvais accountId) (KO) -- access aux résultats d'un sondage restreint en extérieur (mauvais utilisateur connecté) (KO) -- access aux résultats d'un sondage restreint avec bon accountId (OK) -- access aux résultats d'un sondage restreint avec bon utilisateur connecté (OK) -- access aux résultats d'un sondage restreint avec accountId de créateur (OK) -- access aux résultats d'un sondage restreint avec un admin connecté (OK) - -Création d'un sondage (free + text) ------------------------------------ - -- creation avec champs obligatoires remplis (OK) -- creation avec Titre non rempli (KO) -- creation avec aucun choix proposé (KO) -- creation avec deux choix identiques (KO) -- creation avec Date de fin < Date de début (KO) -- creation avec Date de fin antérieur à maintenant (KO) (TODO) -- creation avec Ajout de choix Date de fin < Date de début (KO) -- creation avec Ajout de choix Date de fin antérieur à maintenant (KO) -- creation avec Ajout de choix cochez et remplit + decochez (les dates doivent être supprimées) (OK) (TODO) -- creation avec email invalide (KO) -- creation avec heure avant la fin de sondage <=0 (KO) (TODO) -- TODO Mettre un warning si date de fin proche... (new feature) -- creation avec nombre de choix <=0 (KO) (TODO : pffff quand on veut voter on a un message Le nombre de choix maximal est de -5....) -- TODO Par défaut mettre au moins 1 - -- TODO Quand on déchoche alors il faut desactiver les champs concernés (et pas uniquement les cacher) - -Création d'un sondage (free + date) ------------------------------------ - -- creation avec aucun choix proposé (KO) -- creation avec deux choix identiques (KO) -- creation d'un sondage de Date avec mauvais format (KO) - -Création d'un sondage (free + image) ------------------------------------- - -- creation avec aucun choix proposé (KO) -- creation d'un sondage d'Image avec mauvais mimetype (KO) (TODO) -- creation avec deux images au nom identiques (KO) (TODO) -- TODO Mettre une image avec une croix ROUGE!!! quand pas chargée - -Création d'un sondage (restreint + text) ----------------------------------------- - -- création sans participant (KO) -- création avec deux participants ayant le même nom (KO) -- création avec deux participants ayant le même email (KO) -- création avec un participants ayant juste un email et pas de nom (KO) (TODO : pollenTechincalException) -- création avec un participants ayant juste un nom et pas d'email (KO) -- TODO problème d'enregistrement des plusieurs votants, le dernier est conservé et dupliqué. -- TODO L'email envoyé n'est pas le bon (il manque le token d'account) + la sécurité ne va pas car je ne dois pas avoir accès à ce sondage - -Création d'un sondage (group + text) ----------------------------------------- - -- création sans nom de groupe (KO) -- création avec deux participants ayant le même nom (KO) -- création avec deux participants ayant le même email (KO) -- création avec un participants ayant juste un email et pas de nom (KO) (TODO : pollenTechincalException) -- création avec un participants ayant juste un nom et pas d'email (KO) -- TODO problème d'enregistrement des plusieurs votants, le dernier est conservé et dupliqué. -- TODO Revoir l'enregistrement (le groupe 2 est perdu...) - - -Edition d'un sondage ---------------------- - -- edition avec champs titre vidé (OK) -- edition avec modification date de fin antérieure à maintenant (KO) -- edition avec suppression de tous les choix (KO) - -Page de résumé d'un sondage ---------------------------- - -- TODO supprimer les // dans les urls - Added: trunk/src/site/rst/security.rst =================================================================== --- trunk/src/site/rst/security.rst (rev 0) +++ trunk/src/site/rst/security.rst 2012-06-15 15:09:26 UTC (rev 3480) @@ -0,0 +1,161 @@ +~~~~~~~~~~~~~~~~~~~~~~~~ +Security model in Pollen +~~~~~~~~~~~~~~~~~~~~~~~~ + +Abstract +======== + +- New way of dealing security in Pollen (1.5 ?) + +Roles +===== + +Pollen defines different roles for different usages. Some roles can be found +by the stored Pollen session (in servlet session), others can be found by the +accountId in some urls (example http://pollen/action/pollId:accountId) + +Anonymous +--------- + +This is a not loggued user with nothing is url (no accountId) which can +identify himself. + +Connected user +-------------- + +When a user has been registred inside Pollen and is connected in Pollen. + +We can find him back by using the pollen user account stored in servlet session. + +Admin +----- + +Connected user with more privileges to manage everything in Pollen. + +We can find him back by using the pollen user account stored in servlet session. + +Poll creator +------------ + +Person which has created a poll. It acts as an admin for his very own poll. + +We can find him back by using a accountId in url. + +Poll voter +---------- + +A person which has voted to a poll. + +We can find him back by using a accountId in url. + +Poll participant +---------------- + +A person that can vote on a none free poll. + +We can find him back by using a accountId in url. + +Resources and permissions +========================= + +User +---- + +A user (*UserAccount*) is a Pollen connected user. + +- user:modify +- user:delete + +VotingList +---------- + +A voting list (*VotingList*) is a list of person (name + email) to simplify +creation of restricted poll (you can import in one time a such list for a poll). + +- votingList:modify +- votingList:delete + +Poll +---- + +A poll (*Poll*) is life in Pollen! + +- poll:create +- poll:modify +- poll:vote +- poll:close +- poll:delete +- poll:clone +- poll:export +- poll:votecounting +- poll:comment +- poll:add choice + +Choice +------ + +A choice (*Choice*) is a choice on which to vote in a poll. + +- choice:modify +- choice:delete + +Comment +------- + +A comment (*Comment*) is a comment to be added on a poll. + +- comment:modify +- comment:delete + +Usage of wildcard +----------------- + +To simplify usage of permissions, we will use some wildcard. For example, an +admin can do anything and has all permissions: :: + + user:*:* + poll:*:* (only if poll is free, result public and continuous,...) + choice:*:* + comment:*:* + +A poll creator will have all permissions on his poll: :: + + poll:*:pollId (only if poll is free, result public and continuous,...) + choice:*:pollId (only if choice can add + comment:*:pollId + +But these examples are not quite exact. In facts, a admin or a poll creator could have + +How to implement this security model +==================================== + +Based on Shiro (http://shiro.apache.org/) + +- using authentication mecanism to find roles (http://shiro.apache.org/authentication-features.html) +- using permission mecanism to find role permissions (http://shiro.apache.org/permissions.html) + +Global workflow +--------------- + +When a user wants to acces a resource (page), find out first the user role, +then compute his. + +To tune this we will use a chache of permissions, beacuse it does seem very +realist to recompute at each request the cache for a poll or a connected user. + +From this first cache: + +- key re userAccount or accountId, +- values are his set of permissions, + +we will build one form each poll: + +- key is pollId +- values are users (on which permissions where build) involved by this poll. + +At each poll modification, we then invalidate poll cache for the pollId entry +and then also simply invalidate the cache of all users involved by this poll. + + + + Copied: trunk/src/site/rst/tests.rst (from rev 3478, trunk/doc/tests.rst) =================================================================== --- trunk/src/site/rst/tests.rst (rev 0) +++ trunk/src/site/rst/tests.rst 2012-06-15 15:09:26 UTC (rev 3480) @@ -0,0 +1,119 @@ +~~~~~~~~~~ +Tests d'UI +~~~~~~~~~~ + +Abstract +======== + +- Tests Pollen by ui. +- Needs a db with + - 1 admin user *admin/admin* + - 1 none admin user *user/user* + - 1 none admin user *user2/user2* + - 1 poll of each votecounting type (Normal, pourcentage, Condorcet, Nombre) + some votes on it + - 1 poll with restricted mode + +Scenarii +======== + +Security +-------- + +- authentication avec mauvais login/password (KO) +- authentication avec bon login/password (OK) + +- access aux pages connectés en mode déconnecté (KO) +- access aux pages connectés en mode connecté (OK) + +- access aux pages admin en mode déconnecté (KO) +- access aux pages admin avec un user non admin (KO) +- access aux pages admin avec un user admin (OK) + +- access aux pages d'un sondage avec un mauvais pollId (KO) +- access aux pages d'un sondage avec un bon pollId (OK) + +- access aux pages d'un sondage en mode créateur + - en mode admin (pas de accountId dans l'url) : avec un user non admin (KO) + - en mode admin (pas de accountId dans l'url) : avec un admin (OK) + - en mode créateur (avec mauvais accountId dans l'url) (KO) + - en mode créateur (avec bon accountId dans l'url) (OK) + +- access aux résultats d'un sondage (non restreint) (OK) +- access aux résultats d'un sondage restreint en anonyme (KO) +- access aux résultats d'un sondage restreint en extérieur (mauvais accountId) (KO) +- access aux résultats d'un sondage restreint en extérieur (mauvais utilisateur connecté) (KO) +- access aux résultats d'un sondage restreint avec bon accountId (OK) +- access aux résultats d'un sondage restreint avec bon utilisateur connecté (OK) +- access aux résultats d'un sondage restreint avec accountId de créateur (OK) +- access aux résultats d'un sondage restreint avec un admin connecté (OK) + +Création d'un sondage (free + text) +----------------------------------- + +- creation avec champs obligatoires remplis (OK) +- creation avec Titre non rempli (KO) +- creation avec aucun choix proposé (KO) +- creation avec deux choix identiques (KO) +- creation avec Date de fin < Date de début (KO) +- creation avec Date de fin antérieur à maintenant (KO) (TODO) +- creation avec Ajout de choix Date de fin < Date de début (KO) +- creation avec Ajout de choix Date de fin antérieur à maintenant (KO) +- creation avec Ajout de choix cochez et remplit + decochez (les dates doivent être supprimées) (OK) (TODO) +- creation avec email invalide (KO) +- creation avec heure avant la fin de sondage <=0 (KO) (TODO) +- TODO Mettre un warning si date de fin proche... (new feature) +- creation avec nombre de choix <=0 (KO) (TODO : pffff quand on veut voter on a un message Le nombre de choix maximal est de -5....) +- TODO Par défaut mettre au moins 1 + +- TODO Quand on déchoche alors il faut desactiver les champs concernés (et pas uniquement les cacher) + +Création d'un sondage (free + date) +----------------------------------- + +- creation avec aucun choix proposé (KO) +- creation avec deux choix identiques (KO) +- creation d'un sondage de Date avec mauvais format (KO) + +Création d'un sondage (free + image) +------------------------------------ + +- creation avec aucun choix proposé (KO) +- creation d'un sondage d'Image avec mauvais mimetype (KO) (TODO) +- creation avec deux images au nom identiques (KO) (TODO) +- TODO Mettre une image avec une croix ROUGE!!! quand pas chargée + +Création d'un sondage (restreint + text) +---------------------------------------- + +- création sans participant (KO) +- création avec deux participants ayant le même nom (KO) +- création avec deux participants ayant le même email (KO) +- création avec un participants ayant juste un email et pas de nom (KO) (TODO : pollenTechincalException) +- création avec un participants ayant juste un nom et pas d'email (KO) +- TODO problème d'enregistrement des plusieurs votants, le dernier est conservé et dupliqué. +- TODO L'email envoyé n'est pas le bon (il manque le token d'account) + la sécurité ne va pas car je ne dois pas avoir accès à ce sondage + +Création d'un sondage (group + text) +---------------------------------------- + +- création sans nom de groupe (KO) +- création avec deux participants ayant le même nom (KO) +- création avec deux participants ayant le même email (KO) +- création avec un participants ayant juste un email et pas de nom (KO) (TODO : pollenTechincalException) +- création avec un participants ayant juste un nom et pas d'email (KO) +- TODO problème d'enregistrement des plusieurs votants, le dernier est conservé et dupliqué. +- TODO Revoir l'enregistrement (le groupe 2 est perdu...) + + +Edition d'un sondage +--------------------- + +- edition avec champs titre vidé (OK) +- edition avec modification date de fin antérieure à maintenant (KO) +- edition avec suppression de tous les choix (KO) + +Page de résumé d'un sondage +--------------------------- + +- TODO supprimer les // dans les urls + Property changes on: trunk/src/site/rst/tests.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-06-15 14:45:42 UTC (rev 3479) +++ trunk/src/site/site_en.xml 2012-06-15 15:09:26 UTC (rev 3480) @@ -103,6 +103,11 @@ <item name="English" href="index.html"/> </menu> + <menu name="Technical"> + <item name="Security" href="security.html"/> + <item name="UI Tests" href="tests.html"/> + </menu> + <menu ref="reports"/> <footer>

1 0

r3479 - trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its
by ymartel＠users.chorem.org 15 Jun '12

15 Jun '12

Author: ymartel Date: 2012-06-15 16:45:42 +0200 (Fri, 15 Jun 2012) New Revision: 3479 Url: http://chorem.org/repositories/revision/pollen/3479 Log: refs #606 : add tests for free text poll creation with bad number of choices Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java 2012-06-15 07:30:44 UTC (rev 3478) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java 2012-06-15 14:45:42 UTC (rev 3479) @@ -387,4 +387,94 @@ } + /** + * This test create a free text poll with an invalid email. + * When submit, an error text should be displayed : email should be valid + * + * @throws Exception + */ + @Test + public void createFreeTextPollWithInvalidMaxVotedChoices() throws Exception { + + // Go on create poll page + gotoUrl(fixtures.createPollURL()); + + // Set title + WebElement titleElement = findElement(By.name("poll.title")); + Assert.assertEquals("input", titleElement.getTagName()); + Assert.assertTrue(titleElement.isDisplayed()); + String pollTitle = "My Poll"; + titleElement.sendKeys(pollTitle); + + // Set first choice + WebElement choiceOneElement = findElement(By.name("textChoice_0.name")); + Assert.assertEquals("input", choiceOneElement.getTagName()); + Assert.assertTrue(choiceOneElement.isDisplayed()); + String choiceOne = "Choix numero un"; + choiceOneElement.sendKeys(choiceOne); + + // Go to option panel : click on it + WebElement optionsClick = findElement(By.xpath("//a[@href=\"#toptions\"]")); + optionsClick.click(); + + // Get the maxChoice element : should be disable while limitChoice is not selected + WebElement maxChoiceElement = findElement(By.name("maxChoices")); + Assert.assertEquals("input", maxChoiceElement.getTagName()); + Assert.assertTrue(maxChoiceElement.isDisplayed()); + // Get the checkbox and check it to set number of max choice after + WebElement limitChoiceElement = findElement(By.name("limitChoice")); + Assert.assertEquals("input", limitChoiceElement.getTagName()); + Assert.assertTrue(limitChoiceElement.isEnabled()); + limitChoiceElement.click(); + // Set a negative number of max choice + maxChoiceElement = findElement(By.name("maxChoices")); + Assert.assertTrue(maxChoiceElement.isEnabled()); + maxChoiceElement.clear(); + maxChoiceElement.sendKeys("-1"); + + // Submit form + WebElement submit = findElement(By.name("action:save")); + submit.click(); + + // No choices, should stay on create poll page + Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + + // Check an error message has been displayed + WebElement dateError = findElement(By.className("errorMessage")); + Assert.assertNotNull(dateError); + + // Go on general tab and check that Title and and choice fields values are not lost + WebElement generalClick = findElement(By.xpath("//a[@href=\"#tgeneral\"]")); + generalClick.click(); + + titleElement = findElement(By.name("poll.title")); + Assert.assertTrue(titleElement.isDisplayed()); + Assert.assertEquals(pollTitle, titleElement.getAttribute("value")); + + choiceOneElement = findElement(By.name("textChoice_0.name")); + Assert.assertTrue(choiceOneElement.isDisplayed()); + Assert.assertEquals(choiceOne, choiceOneElement.getAttribute("value")); + + // Second part: try to set "0" for max choice + + // Go back to option panel : click on it + optionsClick = findElement(By.xpath("//a[@href=\"#toptions\"]")); + optionsClick.click(); + + // Set a negative number of max choice + maxChoiceElement = findElement(By.name("maxChoices")); + Assert.assertEquals("input", maxChoiceElement.getTagName()); + Assert.assertTrue(maxChoiceElement.isEnabled()); + maxChoiceElement.clear(); + maxChoiceElement.sendKeys("0"); + + // Submit form + submit = findElement(By.name("action:save")); + submit.click(); + + // No choices, should stay on create poll page + Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + + } + }

1 0

r3478 - trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its
by ymartel＠users.chorem.org 15 Jun '12

15 Jun '12

Author: ymartel Date: 2012-06-15 09:30:44 +0200 (Fri, 15 Jun 2012) New Revision: 3478 Url: http://chorem.org/repositories/revision/pollen/3478 Log: fix htmlunit usage Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java 2012-06-15 07:29:58 UTC (rev 3477) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java 2012-06-15 07:30:44 UTC (rev 3478) @@ -40,6 +40,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeDriverService; +import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.RemoteWebDriver;

1 0

r3477 - trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its
by ymartel＠users.chorem.org 15 Jun '12

15 Jun '12

Author: ymartel Date: 2012-06-15 09:29:58 +0200 (Fri, 15 Jun 2012) New Revision: 3477 Url: http://chorem.org/repositories/revision/pollen/3477 Log: fix htmlunit usage Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java 2012-06-14 16:16:34 UTC (rev 3476) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java 2012-06-15 07:29:58 UTC (rev 3477) @@ -40,7 +40,6 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeDriverService; -import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.RemoteWebDriver; @@ -291,7 +290,6 @@ } if (HtmlUnitDriver.class == driverType) { - result = new HtmlUnitDriver(); ((HtmlUnitDriver) result).setJavascriptEnabled(true); } return result;

1 0

r3476 - in trunk/pollen-ui-struts2: . src/test/java/org/chorem/pollen/ui/its src/test/resources
by ymartel＠users.chorem.org 14 Jun '12

14 Jun '12

Author: ymartel Date: 2012-06-14 18:16:34 +0200 (Thu, 14 Jun 2012) New Revision: 3476 Url: http://chorem.org/repositories/revision/pollen/3476 Log: refs #606 : add tests for free text poll creation with some invalid options \& add a profile to start a server to run ITs Modified: trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-13 17:50:09 UTC (rev 3475) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-14 16:16:34 UTC (rev 3476) @@ -623,6 +623,56 @@ </build> </profile> + <profile> + <id>selenium-server</id> + <properties> + <pollenTestServerPort>8765</pollenTestServerPort> + <pollenTestUrl>http://localhost:${pollenTestServerPort}/${defaultWebContextPath}</pollenTestUrl> + <maven.test.skip>true</maven.test.skip> + </properties> + + <build> + <defaultGoal>pre-integration-test</defaultGoal> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <executions> + + <execution> + <id>start-pollen</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + <configuration> + <daemon>false</daemon> + <webAppConfig> + <descriptor>${basedir}/src/test/resources/web-test.xml</descriptor> + <contextPath>/${defaultWebContextPath}</contextPath> + + </webAppConfig> + <useTestClasspath>true</useTestClasspath> + <systemProperties> + <systemProperty> + <name>siteUrl</name> + <value>${pollenTestUrl}</value> + </systemProperty> + <systemProperty> + <name>jetty.port</name> + <value>${pollenTestServerPort}</value> + </systemProperty> + </systemProperties> + </configuration> + </execution> + + </executions> + </plugin> + + </plugins> + </build> + </profile> + </profiles> </project> Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java 2012-06-13 17:50:09 UTC (rev 3475) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java 2012-06-14 16:16:34 UTC (rev 3476) @@ -22,12 +22,16 @@ */ package org.chorem.pollen.ui.its; +import org.apache.commons.lang3.time.DateUtils; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.DateUtil; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; +import java.util.Date; + /** * Test the well work of a Free text poll creation page. * @@ -69,25 +73,25 @@ gotoUrl(fixtures.createPollURL()); // Set title - WebElement titleElement = driver.findElement(By.name("poll.title")); + WebElement titleElement = findElement(By.name("poll.title")); Assert.assertEquals("input", titleElement.getTagName()); Assert.assertTrue(titleElement.isDisplayed()); titleElement.sendKeys("My Poll"); // Set first choice - WebElement choiceOneElement = driver.findElement(By.name("textChoice_0.name")); + WebElement choiceOneElement = findElement(By.name("textChoice_0.name")); Assert.assertEquals("input", choiceOneElement.getTagName()); Assert.assertTrue(choiceOneElement.isDisplayed()); choiceOneElement.sendKeys("Choix numero un"); // Set second choice - WebElement choiceTwoElement = driver.findElement(By.name("textChoice_1.name")); + WebElement choiceTwoElement = findElement(By.name("textChoice_1.name")); Assert.assertEquals("input", choiceTwoElement.getTagName()); Assert.assertTrue(choiceTwoElement.isDisplayed()); choiceTwoElement.sendKeys("Choix numero deux"); // Submit form - WebElement submit = driver.findElement(By.name("action:save")); + WebElement submit = findElement(By.name("action:save")); submit.click(); // All good, should be on summary page ! @@ -108,36 +112,36 @@ gotoUrl(fixtures.createPollURL()); // Set first choice - WebElement choiceOneElement = driver.findElement(By.name("textChoice_0.name")); + WebElement choiceOneElement = findElement(By.name("textChoice_0.name")); Assert.assertEquals("input", choiceOneElement.getTagName()); Assert.assertTrue(choiceOneElement.isDisplayed()); String choiceOneValue = "Choix numero un"; choiceOneElement.sendKeys(choiceOneValue); // Set second choice - WebElement choiceTwoElement = driver.findElement(By.name("textChoice_1.name")); + WebElement choiceTwoElement = findElement(By.name("textChoice_1.name")); Assert.assertEquals("input", choiceTwoElement.getTagName()); Assert.assertTrue(choiceTwoElement.isDisplayed()); String choiceTwoValue = "Choix numero deux"; choiceTwoElement.sendKeys(choiceTwoValue); // Submit form - WebElement submit = driver.findElement(By.name("action:save")); + WebElement submit = findElement(By.name("action:save")); submit.click(); // Title is missing, should stay on create poll page Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); // Check an error message has been displayed - WebElement titleError = driver.findElement(By.className("errorMessage")); + WebElement titleError = findElement(By.className("errorMessage")); Assert.assertNotNull(titleError); // Check that choice fields are not lost - choiceOneElement = driver.findElement(By.name("textChoice_0.name")); + choiceOneElement = findElement(By.name("textChoice_0.name")); Assert.assertEquals("input", choiceOneElement.getTagName()); Assert.assertTrue(choiceOneElement.isDisplayed()); Assert.assertEquals(choiceOneValue, choiceOneElement.getAttribute("value")); - choiceTwoElement = driver.findElement(By.name("textChoice_1.name")); + choiceTwoElement = findElement(By.name("textChoice_1.name")); Assert.assertEquals("input", choiceTwoElement.getTagName()); Assert.assertTrue(choiceTwoElement.isDisplayed()); Assert.assertEquals(choiceTwoValue, choiceTwoElement.getAttribute("value")); @@ -157,30 +161,230 @@ gotoUrl(fixtures.createPollURL()); // Set title - WebElement titleElement = driver.findElement(By.name("poll.title")); + WebElement titleElement = findElement(By.name("poll.title")); Assert.assertEquals("input", titleElement.getTagName()); Assert.assertTrue(titleElement.isDisplayed()); String pollTitle = "My Poll"; titleElement.sendKeys(pollTitle); // Submit form - WebElement submit = driver.findElement(By.name("action:save")); + WebElement submit = findElement(By.name("action:save")); submit.click(); // No choices, should stay on create poll page Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); - // Check that choice fields are not lost - titleElement = driver.findElement(By.name("poll.title")); + // Check that title field is not lost + titleElement = findElement(By.name("poll.title")); Assert.assertEquals("input", titleElement.getTagName()); Assert.assertTrue(titleElement.isDisplayed()); Assert.assertEquals(pollTitle, titleElement.getAttribute("value")); // Check an error message has been displayed for choices - WebElement choicesError = driver.findElement(By.id("poll_choices_error")); + WebElement choicesError = findElement(By.id("poll_choices_error")); Assert.assertNotNull(choicesError); + } + /** + * This test create a free text poll with a ending date in the past. + * When submit, an error text should be displayed : the poll cannot end before starting ! + * + * @throws Exception + */ + @Test + public void createFreeTextPollWithAnteriorEndingDateThanToday() throws Exception { + + // Go on create poll page + gotoUrl(fixtures.createPollURL()); + + // Set title + WebElement titleElement = findElement(By.name("poll.title")); + Assert.assertEquals("input", titleElement.getTagName()); + Assert.assertTrue(titleElement.isDisplayed()); + String pollTitle = "My Poll"; + titleElement.sendKeys(pollTitle); + + // Set first choice + WebElement choiceOneElement = findElement(By.name("textChoice_0.name")); + Assert.assertEquals("input", choiceOneElement.getTagName()); + Assert.assertTrue(choiceOneElement.isDisplayed()); + String choiceOne = "Choix numero un"; + choiceOneElement.sendKeys(choiceOne); + + // Go to option panel : click on it + WebElement optionsClick = findElement(By.xpath("//a[@href=\"#toptions\"]")); + optionsClick.click(); + + // Set end date + WebElement endDateElement = findElement(By.name("poll.endDate")); + Assert.assertEquals("input", endDateElement.getTagName()); + Assert.assertTrue(endDateElement.isDisplayed()); + //FIXME ymartel 2012/06/14 : review way to get DAte ? + Date aMonthAgo = DateUtils.addMonths(new Date(), -1); + String formatMonthAgo = DateUtil.formatDate(aMonthAgo, "dd/MM/yyyy HH:mm"); + endDateElement.sendKeys(formatMonthAgo); + + // Submit form + WebElement submit = findElement(By.name("action:save")); + submit.click(); + + // No choices, should stay on create poll page + Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + + // Check an error message has been displayed + WebElement dateError = findElement(By.className("errorMessage")); + Assert.assertNotNull(dateError); + + // Check that title is not displayed cause not in the tab in error + titleElement = findElement(By.name("poll.title")); + Assert.assertFalse(titleElement.isDisplayed()); + + // Go on general tab and check that Title and and choice fields values are not lost + WebElement generalClick = findElement(By.xpath("//a[@href=\"#tgeneral\"]")); + generalClick.click(); + + titleElement = findElement(By.name("poll.title")); + Assert.assertTrue(titleElement.isDisplayed()); + Assert.assertEquals(pollTitle, titleElement.getAttribute("value")); + + choiceOneElement = findElement(By.name("textChoice_0.name")); + Assert.assertTrue(choiceOneElement.isDisplayed()); + Assert.assertEquals(choiceOne, choiceOneElement.getAttribute("value")); + } + /** + * This test create a free text poll with a ending date before the starting date. + * When submit, an error text should be displayed : the poll cannot end before starting ! + * + * @throws Exception + */ + @Test + public void createFreeTextPollWithAnteriorEndDateThanStartDate() throws Exception { + + // Go on create poll page + gotoUrl(fixtures.createPollURL()); + + // Set title + WebElement titleElement = findElement(By.name("poll.title")); + Assert.assertEquals("input", titleElement.getTagName()); + Assert.assertTrue(titleElement.isDisplayed()); + String pollTitle = "My Poll"; + titleElement.sendKeys(pollTitle); + + // Set first choice + WebElement choiceOneElement = findElement(By.name("textChoice_0.name")); + Assert.assertEquals("input", choiceOneElement.getTagName()); + Assert.assertTrue(choiceOneElement.isDisplayed()); + String choiceOne = "Choix numero un"; + choiceOneElement.sendKeys(choiceOne); + + // Go to option panel : click on it + WebElement optionsClick = findElement(By.xpath("//a[@href=\"#toptions\"]")); + optionsClick.click(); + + // Set start date to two month ago + WebElement startDateElement = findElement(By.name("poll.endDate")); + Assert.assertEquals("input", startDateElement.getTagName()); + Assert.assertTrue(startDateElement.isDisplayed()); + //FIXME ymartel 2012/06/14 : review way to get DAte ? + Date twoMonthsAgo = DateUtils.addMonths(new Date(), -2); + String formatTwoMonthsAgo = DateUtil.formatDate(twoMonthsAgo, "dd/MM/yyyy HH:mm"); + startDateElement.sendKeys(formatTwoMonthsAgo); + + // Set end date to one months ago + WebElement endDateElement = findElement(By.name("poll.endDate")); + Assert.assertEquals("input", endDateElement.getTagName()); + Assert.assertTrue(endDateElement.isDisplayed()); + //FIXME ymartel 2012/06/14 : review way to get DAte ? + Date oneMonthAgo = DateUtils.addMonths(new Date(), -1); + String formatOneMonthAgo = DateUtil.formatDate(oneMonthAgo, "dd/MM/yyyy HH:mm"); + endDateElement.sendKeys(formatOneMonthAgo); + + // Submit form + WebElement submit = findElement(By.name("action:save")); + submit.click(); + + // No choices, should stay on create poll page + Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + + // Check an error message has been displayed + WebElement dateError = findElement(By.className("errorMessage")); + Assert.assertNotNull(dateError); + + // Go on general tab and check that Title and and choice fields values are not lost + WebElement generalClick = findElement(By.xpath("//a[@href=\"#tgeneral\"]")); + generalClick.click(); + + titleElement = findElement(By.name("poll.title")); + Assert.assertTrue(titleElement.isDisplayed()); + Assert.assertEquals(pollTitle, titleElement.getAttribute("value")); + + choiceOneElement = findElement(By.name("textChoice_0.name")); + Assert.assertTrue(choiceOneElement.isDisplayed()); + Assert.assertEquals(choiceOne, choiceOneElement.getAttribute("value")); + + } + + /** + * This test create a free text poll with an invalid email. + * When submit, an error text should be displayed : email should be valid + * + * @throws Exception + */ + @Test + public void createFreeTextPollWithInvalidEmail() throws Exception { + + // Go on create poll page + gotoUrl(fixtures.createPollURL()); + + // Set title + WebElement titleElement = findElement(By.name("poll.title")); + Assert.assertEquals("input", titleElement.getTagName()); + Assert.assertTrue(titleElement.isDisplayed()); + String pollTitle = "My Poll"; + titleElement.sendKeys(pollTitle); + + // Set first choice + WebElement choiceOneElement = findElement(By.name("textChoice_0.name")); + Assert.assertEquals("input", choiceOneElement.getTagName()); + Assert.assertTrue(choiceOneElement.isDisplayed()); + String choiceOne = "Choix numero un"; + choiceOneElement.sendKeys(choiceOne); + + // Go to option panel : click on it + WebElement optionsClick = findElement(By.xpath("//a[@href=\"#toptions\"]")); + optionsClick.click(); + + WebElement emailElement = findElement(By.name("poll.creator.email")); + Assert.assertEquals("input", emailElement.getTagName()); + Assert.assertTrue(emailElement.isDisplayed()); + emailElement.sendKeys("i@minvalid"); + + // Submit form + WebElement submit = findElement(By.name("action:save")); + submit.click(); + + // No choices, should stay on create poll page + Assert.assertTrue(driver.getCurrentUrl().startsWith(fixtures.createPollURL())); + + // Check an error message has been displayed + WebElement dateError = findElement(By.className("errorMessage")); + Assert.assertNotNull(dateError); + + // Go on general tab and check that Title and and choice fields values are not lost + WebElement generalClick = findElement(By.xpath("//a[@href=\"#tgeneral\"]")); + generalClick.click(); + + titleElement = findElement(By.name("poll.title")); + Assert.assertTrue(titleElement.isDisplayed()); + Assert.assertEquals(pollTitle, titleElement.getAttribute("value")); + + choiceOneElement = findElement(By.name("textChoice_0.name")); + Assert.assertTrue(choiceOneElement.isDisplayed()); + Assert.assertEquals(choiceOne, choiceOneElement.getAttribute("value")); + + } + } Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java 2012-06-13 17:50:09 UTC (rev 3475) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java 2012-06-14 16:16:34 UTC (rev 3476) @@ -171,7 +171,7 @@ if (safeDrivers == null) { List<Class<? extends WebDriver>> allDrivers = Lists.newArrayList(); - allDrivers.add(HtmlUnitDriver.class); +// allDrivers.add(HtmlUnitDriver.class); allDrivers.add(FirefoxDriver.class); // allDrivers.add(ChromeDriver.class); // allDrivers.add(InternetExplorerDriver.class); @@ -289,6 +289,11 @@ } } + + if (HtmlUnitDriver.class == driverType) { + result = new HtmlUnitDriver(); + ((HtmlUnitDriver) result).setJavascriptEnabled(true); + } return result; } } Modified: trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db =================================================================== (Binary files differ)

1 0

r3475 - in trunk: pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/resources pollen-ui-struts2/src/main/resources/config pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 13 Jun '12

13 Jun '12

Author: tchemit Date: 2012-06-13 19:50:09 +0200 (Wed, 13 Jun 2012) New Revision: 3475 Url: http://chorem.org/repositories/revision/pollen/3475 Log: fixes #616: Use another url for moderate (instead of reusing the votefor one) Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ModeratePoll.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml trunk/pollen-ui-struts2/src/main/resources/shiro.ini trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java 2012-06-13 17:49:40 UTC (rev 3474) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java 2012-06-13 17:50:09 UTC (rev 3475) @@ -34,7 +34,7 @@ VOTE("poll/votefor"), RESULT("poll/results"), SUMMARY("poll/summary"), - MODERATE("poll/votefor"), + MODERATE("poll/moderate"), EDIT("poll/modification"), CLOSE("poll/close"), CLONE("poll/clone"), Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java 2012-06-13 17:49:40 UTC (rev 3474) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java 2012-06-13 17:50:09 UTC (rev 3475) @@ -30,8 +30,6 @@ import org.chorem.pollen.business.persistence.PollActions; import org.chorem.pollen.services.PollenServiceSupport; -import java.net.URL; - /** * Service to deal with url used by application. * Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-13 17:49:40 UTC (rev 3474) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-13 17:50:09 UTC (rev 3475) @@ -291,7 +291,7 @@ this.commentAuthor = commentAuthor; } - public String prepareVotePage() throws Exception { + protected String prepareVotePage(boolean moderate) throws Exception { loadPoll(); @@ -302,7 +302,7 @@ // TODO no pagination for the moment, need to retrieve the correct page depends on current pollAccount votes = getVoteService().getAllVotes(poll); - voteAllowed = getVoteService().isVoteAllowed(poll, pollAccount); + voteAllowed = !moderate && getVoteService().isVoteAllowed(poll, pollAccount); // Current vote if (voteAllowed) { @@ -326,20 +326,6 @@ creatorUser = getPollenUserAccount().equals(pollCreator.getUserAccount()); } - // Messages - if (poll.isClosed()) { - addFlashMessage(_("pollen.information.pollClosed")); - } else if (!isPollStarted()) { - addFlashMessage(_("pollen.information.pollNotStarted")); - } else if (isPollFinished()) { - addFlashMessage(_("pollen.information.pollFinished")); - } else if (pollCreator.equals(pollAccount)) { - addFlashWarning(_("pollen.information.vote.creatorUser")); - } - if (isPollChoiceRunning()) { - addFlashMessage(_("pollen.information.pollChoiceRunning")); - } - if (log.isInfoEnabled()) { Date now = serviceContext.getCurrentTime(); log.info("pollChoiceOrVoteStarted = " + isPollChoiceOrVoteStarted()); Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ModeratePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ModeratePoll.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ModeratePoll.java 2012-06-13 17:50:09 UTC (rev 3475) @@ -0,0 +1,43 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +/** + * To moderate votes and comment of a given poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class ModeratePoll extends AbstractVoteAction { + + private static final long serialVersionUID = 1L; + + @Override + public String input() throws Exception { + + prepareVotePage(true); + + addFlashWarning(_("pollen.information.moderate.page")); + return INPUT; + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ModeratePoll.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-13 17:49:40 UTC (rev 3474) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-13 17:50:09 UTC (rev 3475) @@ -51,7 +51,21 @@ @Override public void prepare() throws Exception { - prepareVotePage(); + prepareVotePage(false); + + // Messages + if (getPoll().isClosed()) { + addFlashMessage(_("pollen.information.pollClosed")); + } else if (!isPollStarted()) { + addFlashMessage(_("pollen.information.pollNotStarted")); + } else if (isPollFinished()) { + addFlashMessage(_("pollen.information.pollFinished")); + } else if (isCreatorUser()) { + addFlashWarning(_("pollen.information.vote.creatorUser")); + } + if (isPollChoiceRunning()) { + addFlashMessage(_("pollen.information.pollChoiceRunning")); + } } @Override Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-06-13 17:49:40 UTC (rev 3474) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-06-13 17:50:09 UTC (rev 3475) @@ -180,6 +180,13 @@ <result name="input">/WEB-INF/jsp/poll/vote.jsp</result> </action> +  + <action name="moderate/*" method="input" + class="org.chorem.pollen.ui.actions.poll.ModeratePoll"> + <param name="uriId">{1}</param> + <result name="input">/WEB-INF/jsp/poll/vote.jsp</result> + </action> +  <action name="addChoice/*" class="org.chorem.pollen.ui.actions.poll.AddChoice"> Modified: trunk/pollen-ui-struts2/src/main/resources/shiro.ini =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-06-13 17:49:40 UTC (rev 3474) +++ trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-06-13 17:50:09 UTC (rev 3475) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: UI (struts2) +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### + [main] connected=org.chorem.pollen.ui.security.ConnectedUserRequired @@ -49,6 +72,8 @@ # is pollCreator (can admin a poll) /poll/modification/**=poll,pollCreator +/poll/summary/**=poll,pollCreator +/poll/moderate/**=poll,pollCreator /poll/clone/**=poll,pollCreator /poll/resultLink/**=poll,pollCreator /poll/resume/**=poll,pollCreator \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-06-13 17:49:40 UTC (rev 3474) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-06-13 17:50:09 UTC (rev 3475) @@ -157,11 +157,11 @@ </s:a> </div> -<div style="margin-top: 30px;"> +<%--div style="margin-top: 30px;"> <s:text name="pollen.label.pollRegisterPage"/> <s:a namespace="/user" action="createdList"> <s:text name="pollen.common.myPolls"/> </s:a>. -</div> +</div--%> <sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/> 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-06-13 17:49:40 UTC (rev 3474) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-13 17:50:09 UTC (rev 3475) @@ -113,10 +113,10 @@ <legend><s:text name="pollen.common.aboutPoll"/></legend> <div style="float: right"> <s:if test="creatorUser or userAdmin"> - <s:a namespace="/poll" action="modification/%{uriId}"> + <s:a namespace="/poll" action="summary/%{uriId}"> <img src="<s:url value='/img/editSmall.png'/>" - title="<s:text name='pollen.action.editPoll'/>" - alt="<s:text name='pollen.action.editPoll'/>"/> + title="<s:text name='pollen.action.summaryPoll'/>" + alt="<s:text name='pollen.action.summaryPoll'/>"/> </s:a> </s:if> <s:if test="poll.publicResults">

1 0

r3474 - trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its
by tchemit＠users.chorem.org 13 Jun '12

13 Jun '12

Author: tchemit Date: 2012-06-13 19:49:40 +0200 (Wed, 13 Jun 2012) New Revision: 3474 Url: http://chorem.org/repositories/revision/pollen/3474 Log: add svn headers Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java 2012-06-13 17:49:25 UTC (rev 3473) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java 2012-06-13 17:49:40 UTC (rev 3474) @@ -1,3 +1,25 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.ui.its; import org.junit.Assert; Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r3473 - in trunk/pollen-ui-struts2/src/main: resources/i18n webapp/WEB-INF/jsp/security
by tchemit＠users.chorem.org 13 Jun '12

13 Jun '12

Author: tchemit Date: 2012-06-13 19:49:25 +0200 (Wed, 13 Jun 2012) New Revision: 3473 Url: http://chorem.org/repositories/revision/pollen/3473 Log: i18n on security pages 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_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp 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-06-13 16:58:52 UTC (rev 3472) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-13 17:49:25 UTC (rev 3473) @@ -51,6 +51,7 @@ pollen.action.pollVotingListEdit=Edit that voting list pollen.action.register=Register pollen.action.send=Send +pollen.action.summaryPoll=Goto administration page of the poll pollen.action.validate=Submit pollen.banner.newVersion=New version\! pollen.common.aboutPoll=About the poll @@ -251,6 +252,7 @@ pollen.information.irreversible.operation=Be ware, this operation is irreversible. pollen.information.lostPassword=You will receive a new password to the given email pollen.information.lostPassword.success=An e-mail was sent with your new password. You can change it on your user account page. +pollen.information.moderate.page=From this page you can moderate votes and comments, but not vote. pollen.information.need.login=You must be logged to access this page. Please fill the form below. pollen.information.poll.attached=Poll '%s' attached to your user account. pollen.information.poll.closed=Poll '%s' closed. @@ -302,6 +304,12 @@ pollen.menu.preferences=My account pollen.menu.register=Register pollen.menu.userFavoriteLists=Voting lists +pollen.security.error.admin_required=You must be connected as an administrator to access this page. +pollen.security.error.connected_required=You must be connected to access this page. +pollen.security.error.creator_required=Only the poll creator or an administrator can access this page. +pollen.security.error.poll_access_required=You are not authorise to access this poll page. +pollen.security.error.poll_required=No poll found with the given url. +pollen.security.error.result_access_required=You are not authorise to access this result page. pollen.tab.poll.general=Informations pollen.tab.poll.options=Options pollen.title.clone.poll=Clone a 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-06-13 16:58:52 UTC (rev 3472) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-13 17:49:25 UTC (rev 3473) @@ -51,6 +51,7 @@ pollen.action.pollVotingListEdit=Editer ce groupe de votants pollen.action.register=S'enregistrer pollen.action.send=Envoyer +pollen.action.summaryPoll=Aller sur la page d'administration du sondage pollen.action.validate=Valider pollen.banner.newVersion=Nouvelle version \! pollen.common.aboutPoll=A propos du sondage @@ -251,6 +252,7 @@ pollen.information.irreversible.operation=Attention, Cette opération est irréversible. pollen.information.lostPassword=Vous allez recevoir un nouveau mot de passe sur l'e-mail suivant pollen.information.lostPassword.success=Un e-mail vous a été envoyé avec votre nouveau mot de passe. Vous pouvez le changer sur la page d'édition de votre compte. +pollen.information.moderate.page=A partir de cette page vous pouvez modérer les votes et les commentaires mais pas voter. pollen.information.need.login=Vous devez être identifié pour pouvoir accéder à cette page. Veuillez remplir le formulaire ci-dessous. pollen.information.poll.attached=Sondage '%s' rattaché à votre compte. pollen.information.poll.closed=Sondage '%s' clos. @@ -302,6 +304,12 @@ pollen.menu.preferences=Mon compte pollen.menu.register=Inscrivez-vous pollen.menu.userFavoriteLists=Listes de votants +pollen.security.error.admin_required=Vous devez être connecté en administrateur pour accéder à cette page. +pollen.security.error.connected_required=Vous devez être connecté pour accéder à cette page. +pollen.security.error.creator_required=Seul le créateur du sondage ou un administrateur peut accéder à cette page. +pollen.security.error.poll_access_required=Vous n'êtes pas autorisé à accéder à cette page de sondage. +pollen.security.error.poll_required=Aucun sondage à l'url donné. +pollen.security.error.result_access_required=Vous n'êtes pas autorisé à accéder à cette page de résultats. pollen.tab.poll.general=Informations pollen.tab.poll.options=Options pollen.title.clone.poll=Clonage d'un sondage Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-06-13 16:58:52 UTC (rev 3472) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-06-13 17:49:25 UTC (rev 3473) @@ -1,28 +1,33 @@ <%-- - #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> +#%L +Pollen :: UI (struts2) +$Id$ +$HeadURL$ +%% +Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +%% +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +#L% +--%> +<%@ taglib prefix="s" uri="/struts-tags" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <div class="info_error"> - <ul class="actionErrors"> - <li><span>Vous devez être connecter en administrateur pour accéder à cette page.</span></li> - </ul> + <ul class="actionErrors"> + <li> + <span> + <s:text name="pollen.security.error.admin_required"/> + </span> + </li> + </ul> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-06-13 16:58:52 UTC (rev 3472) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-06-13 17:49:25 UTC (rev 3473) @@ -1,28 +1,33 @@ <%-- - #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> +#%L +Pollen :: UI (struts2) +$Id$ +$HeadURL$ +%% +Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +%% +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +#L% +--%> +<%@ taglib prefix="s" uri="/struts-tags" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <div class="info_error"> - <ul class="actionErrors"> - <li><span>Vous devez être connecter pour accéder à cette page.</span></li> - </ul> + <ul class="actionErrors"> + <li> + <span> + <s:text name="pollen.security.error.connected_required"/> + </span> + </li> + </ul> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-06-13 16:58:52 UTC (rev 3472) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-06-13 17:49:25 UTC (rev 3473) @@ -1,28 +1,33 @@ <%-- - #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> +#%L +Pollen :: UI (struts2) +$Id$ +$HeadURL$ +%% +Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +%% +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +#L% +--%> +<%@ taglib prefix="s" uri="/struts-tags" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <div class="info_error"> - <ul class="actionErrors"> - <li><span>Vous n'êtes pas autorisé à accéder à cette page de sondage.</span></li> - </ul> + <ul class="actionErrors"> + <li> + <span> + <s:text name="pollen.security.error.poll_access_required"/> + </span> + </li> + </ul> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-06-13 16:58:52 UTC (rev 3472) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-06-13 17:49:25 UTC (rev 3473) @@ -1,28 +1,33 @@ <%-- - #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> +#%L +Pollen :: UI (struts2) +$Id$ +$HeadURL$ +%% +Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +%% +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +#L% +--%> +<%@ taglib prefix="s" uri="/struts-tags" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <div class="info_error"> - <ul class="actionErrors"> - <li><span>Seul le créateur du sondage ou un administratuer peut accéder à cette page.</span></li> - </ul> + <ul class="actionErrors"> + <li> + <span> + <s:text name="pollen.security.error.creator_required"/> + </span> + </li> + </ul> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-06-13 16:58:52 UTC (rev 3472) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-06-13 17:49:25 UTC (rev 3473) @@ -1,28 +1,33 @@ <%-- - #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> +#%L +Pollen :: UI (struts2) +$Id$ +$HeadURL$ +%% +Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +%% +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +#L% +--%> +<%@ taglib prefix="s" uri="/struts-tags" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <div class="info_error"> - <ul class="actionErrors"> - <li><span>Aucun sondage à l'url donné.</span></li> - </ul> + <ul class="actionErrors"> + <li> + <span> + <s:text name="pollen.security.error.poll_required"/> + </span> + </li> + </ul> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp 2012-06-13 16:58:52 UTC (rev 3472) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp 2012-06-13 17:49:25 UTC (rev 3473) @@ -1,28 +1,33 @@ <%-- - #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> +#%L +Pollen :: UI (struts2) +$Id$ +$HeadURL$ +%% +Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +%% +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +#L% +--%> +<%@ taglib prefix="s" uri="/struts-tags" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <div class="info_error"> - <ul class="actionErrors"> - <li><span>Vous n'êtes pas autorisé à accéder à cette page de résultas.</span></li> - </ul> + <ul class="actionErrors"> + <li> + <span> + <s:text name="pollen.security.error.result_access_required"/> + </span> + </li> + </ul> </div>

1 0

r3472 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 13 Jun '12

13 Jun '12

Author: tchemit Date: 2012-06-13 18:58:52 +0200 (Wed, 13 Jun 2012) New Revision: 3472 Url: http://chorem.org/repositories/revision/pollen/3472 Log: fixes #601: Account token is missing on link in email for restrictive poll Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.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-06-13 16:58:24 UTC (rev 3471) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-13 16:58:52 UTC (rev 3472) @@ -1017,15 +1017,16 @@ // // FIXME-fdesbois-2012-04-12 : find a better way to ensure accountId String accountId = pollAccount.getAccountId(); - pollAccountLoaded = pollAccountDAO.findByAccountId(accountId); - if (pollAccountLoaded == null) { + if (StringUtils.isBlank(accountId)) { // creates a new pollAccount - pollAccountLoaded = createWithProperties( pollAccountDAO, PollAccount.PROPERTY_ACCOUNT_ID, generateId()); - pollAccountLoaded.setAccountId(accountId); + } else { + + // reuse the existing account + pollAccountLoaded = pollAccountDAO.findByAccountId(accountId); } } else {

1 0

r3471 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org 13 Jun '12

13 Jun '12

Author: tchemit Date: 2012-06-13 18:58:24 +0200 (Wed, 13 Jun 2012) New Revision: 3471 Url: http://chorem.org/repositories/revision/pollen/3471 Log: fix pollen default server url Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-13 16:30:41 UTC (rev 3470) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-13 16:58:24 UTC (rev 3471) @@ -244,7 +244,8 @@ target/${project.build.finalName}-bin.zip </redmine.releaseFiles> - <defaultSiteUrl>http://localhost:8080/poll</defaultSiteUrl> + <defaultWebContextPath>pollen</defaultWebContextPath> + <defaultSiteUrl>http://localhost:8080/${defaultWebContextPath}</defaultSiteUrl> <defaultLogDir>${basedir}/target</defaultLogDir> </properties> @@ -299,7 +300,7 @@ <stopPort>1269</stopPort> <contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml> <webAppConfig> - <contextPath>/pollen</contextPath> + <contextPath>/${defaultWebContextPath}</contextPath> </webAppConfig> <systemProperties> <systemProperty> @@ -318,7 +319,7 @@ <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat7-maven-plugin</artifactId> <configuration> - <path>/pollen</path> + <path>/${defaultWebContextPath}</path> <systemProperties> <siteUrl>${defaultSiteUrl}</siteUrl> <pollen.log.dir>${defaultLogDir}</pollen.log.dir> @@ -331,7 +332,7 @@ <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat6-maven-plugin</artifactId> <configuration> - <path>/pollen</path> + <path>/${defaultWebContextPath}</path> <systemProperties> <siteUrl>${defaultSiteUrl}</siteUrl> <pollen.log.dir>${defaultLogDir}</pollen.log.dir> @@ -549,7 +550,7 @@ </activation> <properties> <pollenTestServerPort>8765</pollenTestServerPort> - <pollenTestUrl>http://localhost:${pollenTestServerPort}/pollen</pollenTestUrl> + <pollenTestUrl>http://localhost:${pollenTestServerPort}/${defaultWebContextPath}</pollenTestUrl> </properties> <build> @@ -570,7 +571,7 @@ <daemon>true</daemon> <webAppConfig> <descriptor>${basedir}/src/test/resources/web-test.xml</descriptor> - <contextPath>/pollen</contextPath> + <contextPath>/${defaultWebContextPath}</contextPath> </webAppConfig> <useTestClasspath>true</useTestClasspath>

1 0