This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 24ff130da1c61a0dc8237d9754610184a98b04c6 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Jan 6 11:00:31 2017 +0100 Improve default configuration + fix topia dao --- .../services/config/PollenServiceConfigOption.java | 8 ++++---- .../org/chorem/pollen/services/service/PollService.java | 4 +++- .../services/service/PollenUIUrlRenderServiceTest.java | 16 ++++++++-------- .../src/test/resources/pollen-services.properties | 1 - 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java index 0489ef8..605b908 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java @@ -220,17 +220,17 @@ public enum PollenServiceConfigOption implements ConfigOptionDef { UI_HOST( "pollen.ui.host", "Url de l'interface utilisateur", - "http://localhost", + "http://localhost:8888/index.html", URL.class), URL_POLL_EDIT( "pollen.ui.url.poll.edit", "Url d'édition de sondage", - "${pollen.ui.host}/#/poll/edit/{pollId}/{pollToken}", + "${pollen.ui.host}#/poll/edit/{pollId}/{pollToken}", String.class), URL_POLL_VOTE( "pollen.ui.url.poll.vote", "Url de vote", - "${pollen.ui.host}/#/poll/vote/{pollId}/{pollToken}", + "${pollen.ui.host}#/poll/vote/{pollId}/{pollToken}", String.class), URL_POLL_VOTE_EDIT( "pollen.ui.url.poll.vote.edit", @@ -240,7 +240,7 @@ public enum PollenServiceConfigOption implements ConfigOptionDef { URL_USER_VALIDATE( "pollen.ui.url.user.validate", "Url de validation d'utilisateur", - "${pollen.ui.host}/#/user/{userId}/{token}", + "${pollen.ui.host}#/user/{userId}/{token}", String.class),; protected final String key; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index bcbc691..c660a24 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -481,7 +481,9 @@ public class PollService extends PollenServiceSupport { paginationParameter = PaginationParameterBean.of(0, pageSize); } - + if (paginationParameter.getOrder() == null) { + paginationParameter.setOrder(Poll.PROPERTY_TITLE); + } return paginationParameter.toPaginationParameter(); } diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUIUrlRenderServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUIUrlRenderServiceTest.java index 601b299..514726d 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUIUrlRenderServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUIUrlRenderServiceTest.java @@ -45,7 +45,7 @@ public class PollenUIUrlRenderServiceTest extends AbstractPollenServiceTest { url = service.getPollenUrl(); Assert.assertNotNull(url); - Assert.assertEquals("http://localhost", url); + Assert.assertEquals(serviceContext.getPollenServiceConfig().getPollenUrl(), url); } @Test @@ -54,11 +54,11 @@ public class PollenUIUrlRenderServiceTest extends AbstractPollenServiceTest { url = service.getPollEditUrl("PollId", null); Assert.assertNotNull(url); - Assert.assertEquals("http://localhost/#/poll/edit/PollId", url); + Assert.assertEquals(serviceContext.getPollenServiceConfig().getPollenUrl() + "#/poll/edit/PollId", url); url = service.getPollEditUrl("PollId", "Token"); Assert.assertNotNull(url); - Assert.assertEquals("http://localhost/#/poll/edit/PollId/Token", url); + Assert.assertEquals(serviceContext.getPollenServiceConfig().getPollenUrl() + "#/poll/edit/PollId/Token", url); } @Test @@ -67,11 +67,11 @@ public class PollenUIUrlRenderServiceTest extends AbstractPollenServiceTest { url = service.getPollVoteUrl("PollId", null); Assert.assertNotNull(url); - Assert.assertEquals("http://localhost/#/poll/vote/PollId", url); + Assert.assertEquals(serviceContext.getPollenServiceConfig().getPollenUrl() + "#/poll/vote/PollId", url); url = service.getPollVoteUrl("PollId", "Token"); Assert.assertNotNull(url); - Assert.assertEquals("http://localhost/#/poll/vote/PollId/Token", url); + Assert.assertEquals(serviceContext.getPollenServiceConfig().getPollenUrl() + "#/poll/vote/PollId/Token", url); } @Test @@ -80,11 +80,11 @@ public class PollenUIUrlRenderServiceTest extends AbstractPollenServiceTest { url = service.getPollVoteEditUrl("PollId", null, "VoteToken"); Assert.assertNotNull(url); - Assert.assertEquals("http://localhost/#/poll/vote/PollId/vote/VoteToken", url); + Assert.assertEquals(serviceContext.getPollenServiceConfig().getPollenUrl() + "#/poll/vote/PollId/vote/VoteToken", url); url = service.getPollVoteEditUrl("PollId", "Token", "VoteToken"); Assert.assertNotNull(url); - Assert.assertEquals("http://localhost/#/poll/vote/PollId/Token/vote/VoteToken", url); + Assert.assertEquals(serviceContext.getPollenServiceConfig().getPollenUrl() + "#/poll/vote/PollId/Token/vote/VoteToken", url); } @Test @@ -94,7 +94,7 @@ public class PollenUIUrlRenderServiceTest extends AbstractPollenServiceTest { url = service.getUserValidateUrl("UserId", "Token"); Assert.assertNotNull(url); - Assert.assertEquals("http://localhost/#/user/UserId/Token", url); + Assert.assertEquals(serviceContext.getPollenServiceConfig().getPollenUrl() + "#/user/UserId/Token", url); } } diff --git a/pollen-services/src/test/resources/pollen-services.properties b/pollen-services/src/test/resources/pollen-services.properties index ca4c885..572e5a5 100644 --- a/pollen-services/src/test/resources/pollen-services.properties +++ b/pollen-services/src/test/resources/pollen-services.properties @@ -25,4 +25,3 @@ hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver #hibernate.hbm2ddl.auto=update pollen.version=${project.version} -pollen.ui.host=http://localhost -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.