branch develop updated (f8a65c7 -> adc387b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from f8a65c7 fixes #1138: Some errors happens after updating to struts2 version to 2.3.15.3 new 55decce fixes #1139: Make poll public result by default new adc387b fixes #1140: Fix configuration site page The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit adc387bea61e2cc55dab94f3a5b79e72e5cf2bc8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 09:34:31 2014 +0100 fixes #1140: Fix configuration site page commit 55deccedd48bc1badfd55125abe0418b1eb5e85b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 09:33:37 2014 +0100 fixes #1139: Make poll public result by default Summary of changes: .../src/main/java/org/chorem/pollen/PollenConfiguration.java | 6 ++++++ .../src/main/java/org/chorem/pollen/PollenConfigurationOption.java | 7 +++++++ .../src/main/resources/i18n/pollen-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/pollen-persistence_fr_FR.properties | 1 + .../src/main/java/org/chorem/pollen/services/impl/PollService.java | 1 + src/site/fr/rst/configure.rst | 2 +- src/site/rst/configure.rst | 2 +- 7 files changed, 18 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 55deccedd48bc1badfd55125abe0418b1eb5e85b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 09:33:37 2014 +0100 fixes #1139: Make poll public result by default --- .../src/main/java/org/chorem/pollen/PollenConfiguration.java | 6 ++++++ .../src/main/java/org/chorem/pollen/PollenConfigurationOption.java | 7 +++++++ .../src/main/resources/i18n/pollen-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/pollen-persistence_fr_FR.properties | 1 + .../src/main/java/org/chorem/pollen/services/impl/PollService.java | 1 + 5 files changed, 16 insertions(+) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java index 64e7a62..6d28e79 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java @@ -135,6 +135,12 @@ public class PollenConfiguration { return result; } + public boolean getDefaultPollResultPublic() { + boolean result = applicationConfig.getOptionAsBoolean( + PollenConfigurationOption.DEFAULT_POLL_RESULT_PUBLIC.key); + return result; + } + public String getAdminLogin() { String result = applicationConfig.getOption( PollenConfigurationOption.ADMIN_LOGIN.key); diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java index f75c88e..35d7ab8 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java @@ -110,6 +110,13 @@ public enum PollenConfigurationOption implements ApplicationConfig.OptionDef { */ DEFAULT_POLL_COMMENT_VISIBILITY("pollen.default.pollCommentVisibility", n_("pollen.configuration.defaultPollCommentVisibility"), PollCommentVisibility.EVERYBODY.name(), PollCommentVisibility.class), + /** + * Default poll comment visibility to use at a new poll creation. + * + * @since 1.4.5 + */ + DEFAULT_POLL_RESULT_PUBLIC("pollen.default.pollResultPublic", n_("pollen.configuration.defaultPollResultPublic"), "true", boolean.class), + /** db driver. */ DB_DRIVER("hibernate.connection.driver_class", n_("pollen.configuration.dbDriver"), org.h2.Driver.class.getName(), Class.class), diff --git a/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties b/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties index 9b15d91..1b59f84 100644 --- a/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties +++ b/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties @@ -15,6 +15,7 @@ pollen.configuration.dbPassword=Password to connect to database pollen.configuration.dbUrl=Database connection url pollen.configuration.defaultChoiceType=Default choice type to use at a new poll creation pollen.configuration.defaultPollCommentVisibility=Default comment visiblity to use at a new poll creation +pollen.configuration.defaultPollResultPublic=Default result public value at a new poll creation pollen.configuration.defaultPollType=Default poll type to use at a new poll creation pollen.configuration.defaultPollVoteVisibility=Default vote visibility to use at a new poll creation pollen.configuration.defaultVoteCountingType=Default vote counting type to use at a new poll creation diff --git a/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties b/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties index 06a568d..4380536 100644 --- a/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties +++ b/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties @@ -15,6 +15,7 @@ pollen.configuration.dbPassword=Mot de passe pour se connecter à la base de don pollen.configuration.dbUrl=Url de connexion à la base de données pollen.configuration.defaultChoiceType=Choix par défaut utiliser lors de la création d'un sondage pollen.configuration.defaultPollCommentVisibility=Visiblité des commentaires par défaut à utiliser lors de la création d'un sondage +pollen.configuration.defaultPollResultPublic=Résultats publiques par défaut lors de la création d'un sondage pollen.configuration.defaultPollType=Type de sondage par défaut à utiliser lors de la création d'un sondage pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut à utiliser lors de la création d'un sondage pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut à utiliser lors de la création d'un sondage diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java index 5979718..e8e794b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java @@ -115,6 +115,7 @@ public class PollService extends PollenServiceSupport { result.setPollType(configuration.getDefaultPollType()); result.setPollVoteVisibility(configuration.getDefaultPollVoteVisibility()); result.setPollCommentVisibility(configuration.getDefaultPollCommentVisibility()); + result.setPublicResults(configuration.getDefaultPollResultPublic()); // use default today as begin date (see http://chorem.org/issues/891) result.setBeginDate(serviceContext.getCurrentTime()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit adc387bea61e2cc55dab94f3a5b79e72e5cf2bc8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 09:34:31 2014 +0100 fixes #1140: Fix configuration site page --- src/site/fr/rst/configure.rst | 2 +- src/site/rst/configure.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/site/fr/rst/configure.rst b/src/site/fr/rst/configure.rst index 7f5c5a6..8f1f1be 100644 --- a/src/site/fr/rst/configure.rst +++ b/src/site/fr/rst/configure.rst @@ -101,4 +101,4 @@ Voici un tableau des propriétés pour les bases usuelles: | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _page des options: ./application-config-report.html +.. _page des options: ./config-report.html diff --git a/src/site/rst/configure.rst b/src/site/rst/configure.rst index 07b0ea7..e9b1357 100644 --- a/src/site/rst/configure.rst +++ b/src/site/rst/configure.rst @@ -96,4 +96,4 @@ Here are the properties for usual databases: | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _options page: ./application-config-report.html +.. _options page: ./config-report.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm