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

r3859 - in branches/pollen-1.5.x: . pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2 src/site
by tchemit＠users.chorem.org Dec. 23, 2013

Dec. 23, 2013

Author: tchemit Date: 2013-12-23 14:44:06 +0100 (Mon, 23 Dec 2013) New Revision: 3859 Url: http://chorem.org/projects/pollen/repository/revisions/3859 Log: fixes #965: Updates mavenpom to 4.4 Modified: branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java branches/pollen-1.5.x/pollen-ui-struts2/pom.xml branches/pollen-1.5.x/pom.xml branches/pollen-1.5.x/src/site/site_en.xml branches/pollen-1.5.x/src/site/site_fr.xml Modified: branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java =================================================================== --- branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2013-12-23 13:44:06 UTC (rev 3859) @@ -39,6 +39,7 @@ import org.chorem.pollen.services.PollenServiceSupport; import org.nuiton.util.StringUtil; +import java.util.Comparator; import java.util.List; import java.util.Locale; @@ -325,7 +326,7 @@ return new PollenEmail(to, subject, content); } - public static class PollenEmail { + public static class PollenEmail implements Comparable<PollenEmail>{ protected String subject; @@ -351,5 +352,10 @@ public String getTo() { return to; } + + @Override + public int compareTo(PollenEmail o) { + return toString().compareTo(o.toString()); + } } } Modified: branches/pollen-1.5.x/pollen-ui-struts2/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/pom.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/pollen-ui-struts2/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -32,6 +32,9 @@ http://localhost:8080/${defaultWebContextPath} </defaultSiteUrl> <defaultLogDir>${basedir}/target</defaultLogDir> + +  + <skipPostRelease>false</skipPostRelease> </properties> <dependencies> Modified: branches/pollen-1.5.x/pom.xml =================================================================== --- branches/pollen-1.5.x/pom.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>4.4</version> </parent> <groupId>org.chorem</groupId> @@ -166,6 +166,8 @@ <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> + <httpCommonsHttpclientVersion>4.3</httpCommonsHttpclientVersion> + <pollenI18nBundle>pollen-i18n</pollenI18nBundle>  <license.licenseName>agpl_v3</license.licenseName> Modified: branches/pollen-1.5.x/src/site/site_en.xml =================================================================== --- branches/pollen-1.5.x/src/site/site_en.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/src/site/site_en.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -38,7 +38,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>1.3.1</version> </skin> <custom> @@ -56,34 +56,34 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.nuiton.org/public/images/logos/logos/maven-feather.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/restructuredtext-logo.…"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/argouml-logo.png"/> </poweredBy> <body> <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + src="http://maven-site.chorem.org/common/0.2/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + href="http://maven-site.chorem.org/common/0.2/css/mavenpom-site.css"/> </head> <breadcrumbs> @@ -134,7 +134,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",install.html," + scmwebeditor_skipDefaultFiles="true"> </div> </footer> Modified: branches/pollen-1.5.x/src/site/site_fr.xml =================================================================== --- branches/pollen-1.5.x/src/site/site_fr.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/src/site/site_fr.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -38,7 +38,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>1.3.1</version> </skin> <custom> @@ -59,31 +59,31 @@ img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/restructuredtext-logo.…"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/argouml-logo.png"/> </poweredBy> <body> <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + src="http://maven-site.chorem.org/common/0.2/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + href="http://maven-site.chorem.org/common/0.2/css/mavenpom-site.css"/> </head> <breadcrumbs> @@ -130,7 +130,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",install.html," + scmwebeditor_skipDefaultFiles="true"> </div> </footer>

1 0

r3858 - branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form
by tchemit＠users.chorem.org Dec. 7, 2013

Dec. 7, 2013

Author: tchemit Date: 2013-12-07 09:00:40 +0100 (Sat, 07 Dec 2013) New Revision: 3858 Url: http://chorem.org/projects/pollen/repository/revisions/3858 Log: fixes #962: You cannot modify the end date if there is a date to add choices Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java 2013-12-02 13:10:39 UTC (rev 3857) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java 2013-12-07 08:00:40 UTC (rev 3858) @@ -194,7 +194,7 @@ * * @since 1.3 */ - private Map<Integer, VotingList> votingLists; + Map<Integer, VotingList> votingLists; private PollUri pollUri; @@ -204,6 +204,8 @@ public abstract boolean isEdit(); + protected abstract void validateChoiceDate(Date currentTime); + @Override public void prepare() throws Exception { @@ -528,7 +530,19 @@ } validateInformations(); - validateOptions(); + validateVotingLists(); + + validateCreatorEmail(); + + Date currentTime = serviceContext.getCurrentTime(); + + validateChoiceDate(currentTime); + + validatePollDate(currentTime); + + validateMaxChoices(); + + validateReminderHourCountdown(); } @Override @@ -942,80 +956,43 @@ } } - protected void validateOptions() { - - if (isVoteStarted()) { - - // no validation on votingLists if vote is started - - } else { - - // -- VotingList -- // - - if (poll.isPollFree()) { - - // nothing to validate - - } else { - - Set<String> groups = Sets.newHashSet(); - Set<String> voters = Sets.newHashSet(); - Set<String> emails = Sets.newHashSet(); - - for (Map.Entry<Integer, VotingList> entry : votingLists.entrySet()) { - validateVotingList(entry.getKey(), - entry.getValue(), - groups, - voters, - emails); - } - } - } - - String creatorEmail = poll.getCreator().getEmail(); - if (StringUtils.isNotBlank(creatorEmail) && - !StringUtil.isEmail(creatorEmail)) { - - addOptionsError("poll.creator.email", - _("pollen.error.email.invalid")); - } - - Date currentTime = serviceContext.getCurrentTime(); - - if (validateEndDate(poll.getBeginChoiceDate(), poll.getEndChoiceDate())) { - - addOptionsError( - "poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); - } - - if (validateEndDate(currentTime, poll.getEndChoiceDate())) { - - addOptionsError( - "poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.before.now")); - } - + protected void validatePollDate(Date currentTime) { + // --- beginDate < endDate if (validateEndDate(poll.getBeginDate(), poll.getEndDate())) { addOptionsError("poll.endDate", _("pollen.error.poll.endDate.before.beginDate")); } - + // --- currentTime < endDate if (validateEndDate(currentTime, poll.getEndDate())) { addOptionsError( "poll.endDate", _("pollen.error.poll.endDate.before.now")); } + } - if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { + protected void validateReminderHourCountdown() { + if (isReminder()) { - addOptionsError("poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.after.endDate")); + // validate reminderHourCountdown + + if (getReminderHourCountdown() == null) { + + // reminderHourCountdown == null + addOptionsError("reminderHourCountdown", + _("pollen.error.poll.reminderHourCountdown.required")); + } else if (getReminderHourCountdown() < 1) { + + // reminderHourCountdown <= 0 + addOptionsError("reminderHourCountdown", + _("pollen.error.poll.reminderHourCountdown.greater.than.0")); + } } + } + protected void validateMaxChoices() { if (isLimitChoice()) { // validate maxChoices @@ -1030,21 +1007,45 @@ _("pollen.error.poll.maxChoice.greater.than.0")); } } + } - if (isReminder()) { + protected void validateCreatorEmail() { + String creatorEmail = poll.getCreator().getEmail(); + if (StringUtils.isNotBlank(creatorEmail) && + !StringUtil.isEmail(creatorEmail)) { - // validate reminderHourCountdown + addOptionsError("poll.creator.email", + _("pollen.error.email.invalid")); + } + } - if (getReminderHourCountdown() == null) { + protected void validateVotingLists() { - // reminderHourCountdown == null - addOptionsError("reminderHourCountdown", - _("pollen.error.poll.reminderHourCountdown.required")); - } else if (getReminderHourCountdown() < 1) { + if (isVoteStarted()) { - // reminderHourCountdown <= 0 - addOptionsError("reminderHourCountdown", - _("pollen.error.poll.reminderHourCountdown.greater.than.0")); + // no validation on votingLists if vote is started + + } else { + + // -- VotingList -- // + + if (poll.isPollFree()) { + + // nothing to validate + + } else { + + Set<String> groups = Sets.newHashSet(); + Set<String> voters = Sets.newHashSet(); + Set<String> emails = Sets.newHashSet(); + + for (Map.Entry<Integer, VotingList> entry : votingLists.entrySet()) { + validateVotingList(entry.getKey(), + entry.getValue(), + groups, + voters, + emails); + } } } } Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java 2013-12-02 13:10:39 UTC (rev 3857) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java 2013-12-07 08:00:40 UTC (rev 3858) @@ -24,6 +24,8 @@ import org.chorem.pollen.business.persistence.Poll; +import java.util.Date; + /** * Clones a poll. * @@ -51,4 +53,22 @@ return poll; } + @Override + protected void validateChoiceDate(Date currentTime) { + + // --- beginChoicedate < endChoiceDate + if (validateEndDate(poll.getBeginChoiceDate(), poll.getEndChoiceDate())) { + + addOptionsError( + "poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); + } + + // --- endChoiceDate < endDate + if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { + + addOptionsError("poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.after.endDate")); + } + } } Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java 2013-12-02 13:10:39 UTC (rev 3857) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java 2013-12-07 08:00:40 UTC (rev 3858) @@ -24,6 +24,8 @@ import org.chorem.pollen.business.persistence.Poll; +import java.util.Date; + /** * Creates a poll. * @@ -51,4 +53,30 @@ return poll; } + @Override + protected void validateChoiceDate(Date currentTime ) { + + // --- beginChoicedate < endChoiceDate + if (validateEndDate(poll.getBeginChoiceDate(), poll.getEndChoiceDate())) { + + addOptionsError( + "poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); + } + + // --- currentTime < endChoiceDate + if (validateEndDate(currentTime, poll.getEndChoiceDate())) { + + addOptionsError( + "poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.before.now")); + } + + // --- endChoiceDate < endDate + if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { + + addOptionsError("poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.after.endDate")); + } + } } Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java 2013-12-02 13:10:39 UTC (rev 3857) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java 2013-12-07 08:00:40 UTC (rev 3858) @@ -25,6 +25,8 @@ import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.services.exceptions.PollNotFoundException; +import java.util.Date; + /** * Edit a poll (load it via {@link #input()}), and save it * via {@link #execute()}). @@ -55,4 +57,23 @@ return poll; } + @Override + protected void validateChoiceDate(Date currentTime) { + + // --- beginChoicedate < endChoiceDate + if (validateEndDate(poll.getBeginChoiceDate(), poll.getEndChoiceDate())) { + + addOptionsError( + "poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); + } + + // --- endChoiceDate < endDate + if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { + + addOptionsError("poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.after.endDate")); + } + } + }

1 0

r3857 - in branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp: admin user
by tchemit＠users.chorem.org Dec. 2, 2013

Dec. 2, 2013

Author: tchemit Date: 2013-12-02 14:10:39 +0100 (Mon, 02 Dec 2013) New Revision: 3857 Url: http://chorem.org/projects/pollen/repository/revisions/3857 Log: fixes #961: Can't modify an account Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-10-25 15:13:13 UTC (rev 3856) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-12-02 13:10:39 UTC (rev 3857) @@ -123,6 +123,7 @@ label="%{getText('pollen.common.lastName')}" size="40"/> <s:checkbox key="editUser.administrator" label="%{getText('pollen.common.administrator')}"/> + <s:hidden key="editUser.email" label=""/> </fieldset> <br/> <s:submit action="edit" key="pollen.action.validate" align="center"/> Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-10-25 15:13:13 UTC (rev 3856) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-12-02 13:10:39 UTC (rev 3857) @@ -52,6 +52,9 @@ key="pollen.common.firstName"/> <s:textfield name="pollenUserAccount.lastName" key="pollen.common.lastName"/> + <s:if test="exists"> + <s:hidden key="pollenUserAccount.email" label=""/> + </s:if> </fieldset> <br/> <s:submit action="edit" key="pollen.action.validate" align="center"/>

1 0