Author: fdesbois Date: 2010-03-09 18:07:37 +0100 (Tue, 09 Mar 2010) New Revision: 2916 Log: Use configuration to set nbVotesPerPage to display : need to be copy (can't merge this) for 1.3 Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/pollen.properties branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 16:57:12 UTC (rev 2915) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 17:07:37 UTC (rev 2916) @@ -1176,6 +1176,16 @@ } /** + * Get the number of votes to display per page from configuration. + * + * @return the number of votes to display per page + */ + public int getNbVotesPerPage() { + return Integer.parseInt( + conf.getProperty(Configuration.PROP_NB_VOTES_PER_PAGE)); + } + + /** * Retrieve votes of the current poll from business module. * The votes are ordered by creation date, only the ones to display are * loaded depends on current page using pager component. Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java 2010-03-09 16:57:12 UTC (rev 2915) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java 2010-03-09 17:07:37 UTC (rev 2916) @@ -31,6 +31,8 @@ public static final String IMG_DIR = "upImgDir"; public static final String PROP_APP_VERSION = "version"; public static final String PROP_CONTACT_EMAIL = "adminEmail"; + public static final String PROP_NB_VOTES_PER_PAGE = + "pollen.ui.nbVotesPerPage"; /** * Retourne les propriétés. Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/pollen.properties =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/pollen.properties 2010-03-09 16:57:12 UTC (rev 2915) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/pollen.properties 2010-03-09 17:07:37 UTC (rev 2916) @@ -45,6 +45,9 @@ ## R\u00C3\u00A9pertoire des flux de syndication (Atom) feedDir=.pollen/feeds +## Nombre de votes affiches sur une page +pollen.ui.nbVotesPerPage=100 + ## Adresse du site (utilis\u00C3\u00A9e pour les emails de rappel) siteUrl= Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-03-09 16:57:12 UTC (rev 2915) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-03-09 17:07:37 UTC (rev 2916) @@ -50,7 +50,7 @@ <p>${voteSizeMessage}</p> <t:feedback t:id="voteFeedback"/> <p:else> - <t:pager t:nbRowsPerPage="3" t:nbTotalRows="poll.nbVotes" t:currentPage="page"/> + <t:pager t:nbRowsPerPage="nbVotesPerPage" t:nbTotalRows="poll.nbVotes" t:currentPage="page"/> </p:else> </t:if> <t:form t:id="voteForm" t:zone="pollZone">