This is an automated email from the git hooks/post-receive script. New commit to branch feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git commit b9687a3a575414df5bc3fe1290978a6d570eb9e1 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 11:46:22 2014 +0200 fix import favoriteList in existing voterList --- .../src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java | 2 +- pollen-rest-api/src/main/resources/mapping | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java index 7ce915e..a0cd2a6 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java @@ -47,7 +47,7 @@ import java.util.Set; */ public class VoterListApi extends WebMotionController { - public PollenEntityRef<VoterList> importFavoriteList(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<FavoriteList> favoriteListId) { + public PollenEntityRef<VoterList> importFavoriteListNewGroup(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<FavoriteList> favoriteListId) { PollenEntityRef<VoterList> principalRef = voterListService.importFavoriteList(pollId.getEntityId(), null, favoriteListId.getEntityId()); return principalRef; diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index d39100b..655b776 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -147,7 +147,7 @@ GET /v1/voteCountingTypes/{id} VoteCountingTypeApi.getVoteCounti # VoterListApi -PUT /v1/polls/{pollId}/favoriteLists/{favoriteListId} VoterListApi.importFavoriteList +PUT /v1/polls/{pollId}/favoriteLists/{favoriteListId} VoterListApi.importFavoriteListNewGroup GET /v1/polls/{pollId}/voterLists VoterListApi.getVoterLists GET /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.getVoterList POST /v1/polls/{pollId}/voterLists VoterListApi.createVoterList -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.