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

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

r3470 - in trunk/pollen-ui-struts2/src: main/webapp/WEB-INF/jsp/poll test/java/org/chorem/pollen/ui test/java/org/chorem/pollen/ui/its test/resources
by ymartel＠users.chorem.org 13 Jun '12

13 Jun '12

Author: ymartel Date: 2012-06-13 18:30:41 +0200 (Wed, 13 Jun 2012) New Revision: 3470 Url: http://chorem.org/repositories/revision/pollen/3470 Log: refs #606 : add tests for free text poll creation with no options Added: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-13 15:59:38 UTC (rev 3469) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-13 16:30:41 UTC (rev 3470) @@ -29,7 +29,7 @@ <s:radio key='poll.choiceType' list="choiceTypes" label='' theme="simple" disabled="%{voteStarted}"/> <hr/> -<s:fielderror fieldName="poll.choices"/> +<s:fielderror fieldName="poll.choices" id="poll_choices_error" /> <s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> @@ -43,7 +43,7 @@ value="%{#choiceNumber}"/></s:set> <div id='choicesTEXT_<s:property value="choiceNumber"/>'> <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> - <sp:fielderror fieldName="%{#prefix}"/> + <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> <div class="fleft choiceName"> <s:label for="%{#prefix}.name" id="choicesTEXT_label_%{#choiceNumber}" theme="simple" value=''/> @@ -97,7 +97,7 @@ <div id='choicesDATE_<s:property value="choiceNumber"/>'> <s:hidden key='%{#prefix}.topiaId' id='%{#prefix}.topiaId' value='%{#choice.topiaId}' label='' theme="simple"/> - <sp:fielderror fieldName="%{#prefix}"/> + <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> <div class="fleft choiceName"> <s:label for="%{#prefix}.name" id="choicesDATE_label_%{choiceNumber}" theme="simple" value=''/> @@ -152,7 +152,7 @@ value="%{#choiceNumber}"/></s:set> <div id='choicesIMAGE_<s:property value="choiceNumber"/>'> <s:hidden key='%{#prefix}.topiaId' value='%{#choice.topiaId}' label=''/> - <sp:fielderror fieldName="%{#prefix}"/> + <sp:fielderror fieldName="%{#prefix}" id="%{#prefix}_error"/> <div class="fleft choiceName"> <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" theme="simple" value=''/> Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java 2012-06-13 15:59:38 UTC (rev 3469) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java 2012-06-13 16:30:41 UTC (rev 3470) @@ -142,4 +142,12 @@ public String poll_creator_requiredURL() { return baseUrl() + "security/poll_creator_required"; } + + public String createPollURL() { + return baseUrl() + "poll/create"; + } + + public String summaryURL() { + return baseUrl() + "poll/summary"; + } } Added: 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 (rev 0) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeTextPollSIT.java 2012-06-13 16:30:41 UTC (rev 3470) @@ -0,0 +1,164 @@ +package org.chorem.pollen.ui.its; + +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; + +/** + * Test the well work of a Free text poll creation page. + * + * Tested cases : + * <ul> + * <li>Classic creation with filled mandatory fields (OK)</li> + * <li>Classic creation with no title (KO)</li> + * <li>Classic creation with no choice (KO)</li> + * <li>Classic creation with two same choices (KO)</li> + * <li>Classic creation with ending date before starting date (KO)</li> + * <li>Classic creation with ending date before now (KO)</li> + * <li>Classic creation with invalid email (KO)</li> + * <li>Classic creation with an authorized number of choice per vote < 1 (KO)</li> + * <li>Classic creation with choice adding ending date before starting date (KO)</li> + * <li>Classic creation with choice adding starting date after poll ending date (KO)</li> + * <li>Classic creation with choice adding ending date after poll ending date (KO)</li> + * </ul> + * + * @author ymartel <martel(a)codelutin.com> + * + * @since 1.4 + */ +public class CreateFreeTextPollSIT extends PollenBaseWebDriverIT { + + public CreateFreeTextPollSIT(Class<? extends WebDriver> driverType) { + super(driverType); + } + + /** + * This test create a simple free text poll. + * At the end, should be on summary page. + * + * @throws Exception + */ + @Test + public void createSimpleFreeTextPoll() throws Exception { + + // Go on home page + gotoUrl(fixtures.createPollURL()); + + // Set title + WebElement titleElement = driver.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")); + 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")); + Assert.assertEquals("input", choiceTwoElement.getTagName()); + Assert.assertTrue(choiceTwoElement.isDisplayed()); + choiceTwoElement.sendKeys("Choix numero deux"); + + // Submit form + WebElement submit = driver.findElement(By.name("action:save")); + submit.click(); + + // All good, should be on summary page ! + String currentUrl = driver.getCurrentUrl(); + Assert.assertTrue(currentUrl.startsWith(fixtures.summaryURL())); + } + + /** + * This test create a simple free text poll without a title. + * When submit, an error text should be displayed : title is mandatory + * + * @throws Exception + */ + @Test + public void createSimpleFreeTextPollWithoutTitle() throws Exception { + + // Go on home page + gotoUrl(fixtures.createPollURL()); + + // Set first choice + WebElement choiceOneElement = driver.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")); + 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")); + 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")); + Assert.assertNotNull(titleError); + + // Check that choice fields are not lost + choiceOneElement = driver.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")); + Assert.assertEquals("input", choiceTwoElement.getTagName()); + Assert.assertTrue(choiceTwoElement.isDisplayed()); + Assert.assertEquals(choiceTwoValue, choiceTwoElement.getAttribute("value")); + + } + + /** + * This test create a simple free text poll with no choice. + * When submit, an error text should be displayed : at least one choice must be given + * + * @throws Exception + */ + @Test + public void createSimpleFreeTextPollWithoutChoice() throws Exception { + + // Go on home page + gotoUrl(fixtures.createPollURL()); + + // Set title + WebElement titleElement = driver.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")); + 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")); + 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")); + Assert.assertNotNull(choicesError); + + + } + +} Modified: trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db =================================================================== (Binary files differ)

1 0

r3469 - in trunk/pollen-ui-struts2/src/main: resources/i18n webapp/js
by tchemit＠users.chorem.org 13 Jun '12

13 Jun '12

Author: tchemit Date: 2012-06-13 17:59:38 +0200 (Wed, 13 Jun 2012) New Revision: 3469 Url: http://chorem.org/repositories/revision/pollen/3469 Log: readd lost options + disable all hidden input (pass from 126 fields to 65\!) 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/js/createPoll.js 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 15:58:45 UTC (rev 3468) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-13 15:59:38 UTC (rev 3469) @@ -232,6 +232,8 @@ pollen.fieldset.userInformation.toCreate=User informations to create pollen.fieldset.userInformation.toDelete=User informations to delete pollen.fieldset.userInformation.toUpdate=User informations to update +pollen.fieldset.vote.options=Votes +pollen.fieldset.vote.options.help=Configure votes of the poll pollen.image.not.loaded=Image not loaded pollen.information.choice.deleted=Choice deleted. pollen.information.comment.added=Comment added. 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 15:58:45 UTC (rev 3468) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-13 15:59:38 UTC (rev 3469) @@ -232,6 +232,8 @@ pollen.fieldset.userInformation.toCreate=Informations de l'utilisateur à créer pollen.fieldset.userInformation.toDelete=Informations de l'utilisateur à supprimer pollen.fieldset.userInformation.toUpdate=Informations de l'utilisateur à mettre à jour +pollen.fieldset.vote.options=Les votes +pollen.fieldset.vote.options.help=Configurer les votes du sondage pollen.image.not.loaded=Image non chargée pollen.information.choice.deleted=Choix supprimé. pollen.information.comment.added=Commentaire ajouté. Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-13 15:58:45 UTC (rev 3468) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-13 15:59:38 UTC (rev 3469) @@ -490,8 +490,8 @@ function switchChoices(containerId, choicePrefix, choiceNumber, newChoiceNumber) { - console.info("will switch (" + choicePrefix + ") [" + choiceNumber - + "] to [" + newChoiceNumber + "]"); + //console.info("will switch (" + choicePrefix + ") [" + choiceNumber + // + "] to [" + newChoiceNumber + "]"); // change topiaId switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.topiaId'); @@ -517,7 +517,7 @@ var choiceTIVal = choiceTI.val(); var newChoiceTI = $('[name="' + choicePrefix + newChoiceNumber + suffix + '"]'); var newChoiceTIVal = newChoiceTI.val(); - console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); + //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); choiceTI.val(newChoiceTIVal); newChoiceTI.val(choiceTIVal); } @@ -528,19 +528,19 @@ var choiceTIVal = choiceTI.attr("alt"); var newChoiceTIVal = newChoiceTI.attr("alt"); - console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); + //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); choiceTI.attr("alt", newChoiceTIVal); newChoiceTI.attr("alt", choiceTIVal); choiceTIVal = choiceTI.attr("title"); newChoiceTIVal = newChoiceTI.attr("title"); - console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); + //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); choiceTI.attr("title", newChoiceTIVal); newChoiceTI.attr("title", choiceTIVal); choiceTIVal = choiceTI.attr("src"); newChoiceTIVal = newChoiceTI.attr("src"); - console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); + //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); choiceTI.attr("src", newChoiceTIVal); newChoiceTI.attr("src", choiceTIVal); } @@ -558,67 +558,59 @@ jQuery(document).ready(function () { function changeChoiceAddAllowed(val) { -// if (val) { -// $('#addChoiceAddAllowedPanel').show(); -// } else { -// $('#addChoiceAddAllowedPanel').hide(); -// } $('[name="poll.beginChoiceDate"],[name="poll.endChoiceDate"]').attr( 'disabled', !val); } function changeLimitChoice(val) { -// if (val) { -// $('#maxChoiceNbPanel').show(); -// } else { -// $('#maxChoiceNbPanel').hide(); -// } $('[name="maxChoices"]').attr('disabled', !val); } function changeReminder(val) { -// if (val) { -// $('#reminderPanel').show(); -// } else { -// $('#reminderPanel').hide(); -// } $('[name="reminderHourCountdown"]').attr('disabled', !val); } function changePublicOption(val) { -// if (val) { -// $('#publicPanel').show(); -// } else { -// $('#publicPanel').hide(); -// } $('[name="poll.continuousResults"]').attr('disabled', !val); } function changeAnonymousOption(val) { -// if (val) { -// $('#anonymousPanel').show(); -// } else { -// $('#anonymousPanel').hide(); -// } - $('[name="poll.anonymousVoteAllowed"]').attr('disabled', !val); + $('[name="poll.anonymousVoteAllowed"]').attr('disabled', val); } + function disableAll() { + $("#" + $(this).attr('id') + " :input").attr('disabled', true); + } + + function undisableAll() { + $("#" + $(this).attr('id') + " :input").attr('disabled', false); + } + function changePollType(type) { + var container = $('#pollType' + type); - $('.pollType').addClass('hidden'); - $('.pollType').removeClass('thispoll'); - $('#pollType' + type).removeClass('hidden'); - $('#pollType' + type).addClass('thispoll'); + // traitement des autres containers de type + $('.pollType').not(container). + addClass('hidden').removeClass('thispoll'). + each(disableAll); + // traitement du nouveau container de type + container.removeClass('hidden').addClass('thispoll'). + each(undisableAll); $('[name="poll.pollType"]').attr('checked', false); $('[name="poll.pollType"][value="' + type + '"]').attr('checked', 'checked'); } function changeChoiceType(type) { - $('.choices').addClass('hidden'); - $('.choices').removeClass('thischoice'); - $('#choices' + type).removeClass('hidden'); - $('#choices' + type).addClass('thischoice'); + var container = $('#choices' + type); + // traitement des autres containers de choix + $('.choices').not(container). + addClass('hidden').removeClass('thischoice'). + each(disableAll); + // traitement du nouveau container de choix + container.removeClass('hidden'). + addClass('thischoice').each(undisableAll); + $('[name="poll.choiceType"]').attr('checked', false); $('[name="poll.choiceType"][value="' + type + '"]').attr('checked', 'checked'); } @@ -630,6 +622,9 @@ $('[name="poll.publicResults"]').change(function () { changePublicOption($(this).prop('checked')); }); + $('[name="poll.anonymous"]').change(function () { + changeAnonymousOption($(this).prop('checked')); + }); $('[name="limitChoice"]').change(function () { changeLimitChoice($(this).prop('checked')); @@ -639,15 +634,6 @@ changeReminder($(this).prop('checked')); }); - $('[name="poll.anonymous"]').change(function () { - var val = $(this).prop('checked'); - $('[name="poll.anonymousVoteAllowed"]').prop('checked', val); - }); -// $('[name="poll.continuousResults"]').change(function () { -// var val = $(this).prop('checked'); -// $('[name="poll.publicResults"]').prop('checked', val); -// }); - $('[name="poll.choiceType"]').change(function () { changeChoiceType($(this).val()); });

1 0

r3468 - trunk/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 17:58:45 +0200 (Wed, 13 Jun 2012) New Revision: 3468 Url: http://chorem.org/repositories/revision/pollen/3468 Log: readd lost options Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-13 15:57:49 UTC (rev 3467) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-13 15:58:45 UTC (rev 3468) @@ -198,6 +198,25 @@ <fieldset> <legend> + <s:text name="pollen.fieldset.vote.options"/> + <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" + title="<s:text name='pollen.fieldset.vote.options.help'/>" + alt="<s:text name='pollen.fieldset.vote.options.help'/>"/> + </legend> + + <s:checkbox key="poll.anonymous" + label="%{getText('pollen.common.pollOption.anonymous')}" + disabled="%{voteStarted}" + tooltip="%{getText('pollen.common.pollOption.anonymous.help')}" + tooltipIconPath="/img/tooltip.png"/> + <s:checkbox key="poll.anonymousVoteAllowed" + label="%{getText('pollen.common.pollOption.anonymousVoteAllowed')}" + disabled="%{voteStarted}" + tooltip="%{getText('pollen.common.pollOption.anonymousVoteAllowed.help')}" + tooltipIconPath="/img/tooltip.png"/> + </fieldset> + <br/><fieldset> + <legend> <s:text name="pollen.fieldset.result.options"/> <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" title="<s:text name='pollen.fieldset.result.options.help'/>"

1 0

r3467 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll
by tchemit＠users.chorem.org 13 Jun '12

13 Jun '12

Author: tchemit Date: 2012-06-13 17:57:49 +0200 (Wed, 13 Jun 2012) New Revision: 3467 Url: http://chorem.org/repositories/revision/pollen/3467 Log: fixes #603: In Group poll, error with several group member fixes #604: Cannot add an other group Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-13 14:38:19 UTC (rev 3466) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-13 15:57:49 UTC (rev 3467) @@ -839,9 +839,8 @@ int votingListNumber = Integer.valueOf(matcher.group(2)); - votingListPrefix += "_" + votingListNumber; buildVotingList(paramName, - votingListPrefix, + votingListPrefix+ "_" + votingListNumber, votingListNumber, result ); @@ -859,7 +858,6 @@ // add personToList maps to session (but just now, since votingList // could have been reindex) for (Map.Entry<Integer, VotingList> entry : result.entrySet()) { -// Integer votingListNumber = entry.getKey(); VotingList votingList = entry.getValue(); if (!votingList.isPollAccountPersonToListEmpty()) {

1 0