Author: tchemit Date: 2014-05-16 14:25:43 +0200 (Fri, 16 May 2014) New Revision: 3958 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3958 Log: add default resultVisibility option Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2014-05-16 12:25:22 UTC (rev 3957) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2014-05-16 12:25:43 UTC (rev 3958) @@ -32,6 +32,7 @@ import org.chorem.pollen.persistence.entity.ChoiceType; import org.chorem.pollen.persistence.entity.CommentVisibility; import org.chorem.pollen.persistence.entity.PollType; +import org.chorem.pollen.persistence.entity.ResultVisibility; import org.chorem.pollen.persistence.entity.VoteVisibility; import org.chorem.pollen.services.PollenTechnicalException; import org.nuiton.config.ApplicationConfig; @@ -149,6 +150,13 @@ return result; } + public ResultVisibility getDefaultResultVisibility() { + ResultVisibility result = applicationConfig.getOption( + ResultVisibility.class, + PollenServiceConfigOption.DEFAULT_RESULT_VISIBILITY.key); + return result; + } + public ChoiceType getDefaultChoiceType() { ChoiceType result = applicationConfig.getOption( ChoiceType.class, Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java 2014-05-16 12:25:22 UTC (rev 3957) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java 2014-05-16 12:25:43 UTC (rev 3958) @@ -26,6 +26,7 @@ import org.chorem.pollen.persistence.entity.ChoiceType; import org.chorem.pollen.persistence.entity.CommentVisibility; import org.chorem.pollen.persistence.entity.PollType; +import org.chorem.pollen.persistence.entity.ResultVisibility; import org.chorem.pollen.persistence.entity.VoteVisibility; import org.nuiton.config.ConfigOptionDef; @@ -97,6 +98,17 @@ CommentVisibility.class), /** + * Default poll comment visibility to use at a new poll creation. + * + * @since 2.0 + */ + DEFAULT_RESULT_VISIBILITY( + "pollen.default.pollResultVisibility", + n("pollen.configuration.defaultPollResultVisibility"), + ResultVisibility.EVERYBODY.name(), + ResultVisibility.class), + + /** * Default poll choice type to use at a new choice creation. * * @since 2.0 Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java 2014-05-16 12:25:22 UTC (rev 3957) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java 2014-05-16 12:25:43 UTC (rev 3958) @@ -120,6 +120,7 @@ result.setPollType(getPollenServiceConfig().getDefaultPollType()); result.setVoteVisibility(getPollenServiceConfig().getDefaultVoteVisibility()); result.setCommentVisibility(getPollenServiceConfig().getDefaultCommentVisibility()); + result.setResultVisibility(getPollenServiceConfig().getDefaultResultVisibility()); result.setBeginDate(serviceContext.getNow()); // -- creator -- //