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

r3771 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 22 Apr '13

22 Apr '13

Author: tchemit Date: 2013-04-22 21:54:47 +0200 (Mon, 22 Apr 2013) New Revision: 3771 Url: http://chorem.org/projects/pollen/repository/revisions/3771 Log: fixes #892: Cannot clone a closed 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 2013-04-22 19:35:27 UTC (rev 3770) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2013-04-22 19:54:47 UTC (rev 3771) @@ -145,6 +145,12 @@ if (clone) { // reset id for clone case result.setPollId(null); + + // when cloning no more closed poll (see http://chorem.org/issues/892) + result.setClosed(false); + + // remove end date (otherwise can't vote any longer) + result.setEndDate(null); } // -- Creator -- // @@ -217,8 +223,11 @@ result.addPreventRule(preventRuleEditable); } - // Load votes to have the correct size used to check if vote is started - result.setVote(poll.getVote()); + if (!clone) { + // if cloned, then remove all votes (to be able to edit poll again see http://chorem.org/issues/892) + // Load votes to have the correct size used to check if vote is started + result.setVote(poll.getVote()); + } } return result; }

1 0

r3770 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 22 Apr '13

22 Apr '13

Author: tchemit Date: 2013-04-22 21:35:27 +0200 (Mon, 22 Apr 2013) New Revision: 3770 Url: http://chorem.org/projects/pollen/repository/revisions/3770 Log: fixes #891: Automatically fill the "begin date" when a poll is newly created 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 2013-04-17 13:20:08 UTC (rev 3769) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2013-04-22 19:35:27 UTC (rev 3770) @@ -116,6 +116,9 @@ result.setPollVoteVisibility(configuration.getDefaultPollVoteVisibility()); result.setPollCommentVisibility(configuration.getDefaultPollCommentVisibility()); + // use default today as begin date (see http://chorem.org/issues/891) + result.setBeginDate(serviceContext.getCurrentTime()); + // Initialize creator of the poll PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); PollAccount creator = newInstance(pollAccountDAO);

1 0

r3769 - trunk
by tchemit＠users.chorem.org 17 Apr '13

17 Apr '13

Author: tchemit Date: 2013-04-17 15:20:08 +0200 (Wed, 17 Apr 2013) New Revision: 3769 Url: http://chorem.org/projects/pollen/repository/revisions/3769 Log: try to use topia 2.8-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-29 13:13:32 UTC (rev 3768) +++ trunk/pom.xml 2013-04-17 13:20:08 UTC (rev 3769) @@ -148,7 +148,7 @@ <projectId>pollen</projectId>  - <topiaVersion>2.7.1</topiaVersion> + <topiaVersion>2.8-SNAPSHOT</topiaVersion> <eugenePluginVersion>2.6</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> @@ -161,7 +161,7 @@ <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.7.2</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> - <hibernateVersion>3.6.10.Final</hibernateVersion> + <hibernateVersion>4.2.0.Final</hibernateVersion> <seleniumVersion>2.28.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion>

1 0