[pollen] branch feature/permissionPollRestricted updated (aa9fcff -> 52a6ea2)
This is an automated email from the git hooks/post-receive script. New change to branch feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git from aa9fcff add button save in all create poll page, fix label-block, improve UI new 76332cd fix import favoriteList in voterList new b9687a3 fix import favoriteList in existing voterList new ea88e76 fix link voterListMember and pollenUser when import favoriteList new 52a6ea2 fix route in edit poll, fix style title in poll settings The 4 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 52a6ea27aeab45fbf7256d14509858965f4a82ee Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 11:49:04 2014 +0200 fix route in edit poll, fix style title in poll settings commit ea88e765a2c8165d2e2259a61c0bdf367c90f8a0 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 11:47:16 2014 +0200 fix link voterListMember and pollenUser when import favoriteList commit b9687a3a575414df5bc3fe1290978a6d570eb9e1 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 11:46:22 2014 +0200 fix import favoriteList in existing voterList commit 76332cd6e6d64cec2aa58dc647fbeab33cc1d56a Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 10:25:50 2014 +0200 fix import favoriteList in voterList Summary of changes: .../org/chorem/pollen/rest/api/v1/VoterListApi.java | 2 +- pollen-rest-api/src/main/resources/mapping | 2 +- .../pollen/services/bean/VoterListMemberBean.java | 11 ++++++----- .../pollen/services/service/VoterListService.java | 17 +++++++++-------- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/controllers/pollCtrl.js | 8 ++++---- pollen-ui-angular/src/main/webapp/less/style.less | 12 +++++++----- pollen-ui-angular/src/main/webapp/partials/poll.html | 4 ++-- 8 files changed, 31 insertions(+), 27 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 feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git commit 76332cd6e6d64cec2aa58dc647fbeab33cc1d56a Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 10:25:50 2014 +0200 fix import favoriteList in voterList --- .../chorem/pollen/services/bean/VoterListMemberBean.java | 11 ++++++----- .../chorem/pollen/services/service/VoterListService.java | 16 ++++++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java index f2d35e4..0bbf458 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java @@ -21,6 +21,7 @@ package org.chorem.pollen.services.bean; * #L% */ +import org.chorem.pollen.persistence.entity.PollenPrincipal; import org.chorem.pollen.persistence.entity.PollenPrincipalImpl; import org.chorem.pollen.persistence.entity.VoterListMember; import org.chorem.pollen.persistence.entity.VoterListMemberImpl; @@ -60,12 +61,12 @@ public class VoterListMemberBean extends PollenBean<VoterListMember> { VoterListMember entity = new VoterListMemberImpl(); entity.setTopiaId(getEntityId()); - if (entity.getMember() == null) { - entity.setMember(new PollenPrincipalImpl()); - } - entity.getMember().setEmail(getEmail()); - entity.getMember().setName(getName()); + PollenPrincipal member = new PollenPrincipalImpl(); + member.setEmail(getEmail()); + member.setName(getName()); + entity.setMember(member); + entity.setWeight(getWeight()); return entity; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java index cc85b2b..e0f0dc2 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java @@ -106,19 +106,23 @@ public class VoterListService extends PollenServiceSupport { VoterListMemberTopiaDao voterListMemberDao = getVoterListMemberDao(); + PollenPrincipalTopiaDao pollenPrincipalDao = + getPollenPrincipalDao(); List<FavoriteListMember> favoriteListMembers = getFavoriteListService().getFavoriteListMembers0(favoriteList); for (FavoriteListMember favoriteListMember : favoriteListMembers) { - VoterListMemberBean voterListMemberBean = new VoterListMemberBean(); - voterListMemberBean.setWeight(1d); - voterListMemberBean.setName(favoriteListMember.getName()); - voterListMemberBean.setEmail(favoriteListMember.getEmail()); + PollenPrincipal member = pollenPrincipalDao.create(); + member.setName(favoriteListMember.getName()); + member.setEmail(favoriteListMember.getEmail()); + VoterListMember voterListMember = voterListMemberDao.create(); - ErrorMap errorMap = checkVoterListMember(existingVoterListMembers, voterListMemberBean); + voterListMember.setMember(member); + voterListMember.setWeight(1d); + + ErrorMap errorMap = checkVoterListMember(existingVoterListMembers, toBean(VoterListMemberBean.class, voterListMember)); if (errorMap.isEmpty()) { // no error then create member - VoterListMember voterListMember = voterListMemberBean.toEntity(); voterListMember.setVoterList(result); voterListMemberDao.create(voterListMember); } -- 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 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>.
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 ea88e765a2c8165d2e2259a61c0bdf367c90f8a0 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 11:47:16 2014 +0200 fix link voterListMember and pollenUser when import favoriteList --- .../chorem/pollen/services/service/VoterListService.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java index e0f0dc2..6a26ba5 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java @@ -112,19 +112,16 @@ public class VoterListService extends PollenServiceSupport { List<FavoriteListMember> favoriteListMembers = getFavoriteListService().getFavoriteListMembers0(favoriteList); for (FavoriteListMember favoriteListMember : favoriteListMembers) { - PollenPrincipal member = pollenPrincipalDao.create(); - member.setName(favoriteListMember.getName()); - member.setEmail(favoriteListMember.getEmail()); - VoterListMember voterListMember = voterListMemberDao.create(); + VoterListMemberBean voterListMember = new VoterListMemberBean(); - voterListMember.setMember(member); + voterListMember.setName(favoriteListMember.getName()); + voterListMember.setEmail(favoriteListMember.getEmail()); voterListMember.setWeight(1d); - ErrorMap errorMap = checkVoterListMember(existingVoterListMembers, toBean(VoterListMemberBean.class, voterListMember)); + ErrorMap errorMap = checkVoterListMember(existingVoterListMembers, voterListMember); if (errorMap.isEmpty()) { // no error then create member - voterListMember.setVoterList(result); - voterListMemberDao.create(voterListMember); + saveVoterListMember(result, voterListMember); } } -- 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 feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git commit 52a6ea27aeab45fbf7256d14509858965f4a82ee Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 11:49:04 2014 +0200 fix route in edit poll, fix style title in poll settings --- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 8 ++++---- pollen-ui-angular/src/main/webapp/less/style.less | 12 +++++++----- pollen-ui-angular/src/main/webapp/partials/poll.html | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 89b1812..2e95217 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -60,7 +60,7 @@ angular.module('pollen', ['pollenDirective', 'pollenServices', 'ngRoute', 'Polle .config(['$routeProvider', function($routeProvider) { $routeProvider.when('/', {templateUrl: './partials/home.html', controller: "HomeCtrl"}) .when('/poll/create/:tab?', {templateUrl: './partials/poll.html', controller: "PollCreateCtrl"}) - .when('/poll/edit/:pollId/:pollToken?/:tab?', {templateUrl: './partials/poll.html', controller:"PollCtrl"}) + .when('/poll/edit/:pollId/:pollToken?/tab/:tab?', {templateUrl: './partials/poll.html', controller:"PollCtrl"}) .when('/poll/vote/:pollId/:pollToken?', {templateUrl: './partials/poll.html', controller :"PollCtrl"}) .when('/poll/vote/:pollId/:pollToken?/vote/:voteToken', {templateUrl: './partials/poll.html', controller :"PollCtrl"}) .when('/poll/result/:pollId/:pollToken?', {templateUrl: './partials/poll.html', controller :"PollCtrl"}) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 1405d47..704b3d1 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -154,12 +154,12 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr if (angular.isDefined($scope.globalVariables.pollToken)) { $scope.globalVariables.linkHome += '/'+$scope.globalVariables.pollToken; $scope.globalVariables.linkEdit += '/'+$scope.globalVariables.pollToken; - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'/conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'/participant'; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'/tab/conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'/tab/participant'; } else { - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'/conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'/participant'; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'/tab/conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'/tab/participant'; } }); } diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index d87a1b9..3ce7125 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -214,11 +214,13 @@ body { } #poll-content { - h4 { - font-weight: bold; - border-left: 8px solid; - padding-left: 4px; - color: #555; + .poll-settings { + h4 { + font-weight: bold; + border-left: 8px solid; + padding-left: 4px; + color: #555; + } } .pollTitle, .pollDesc { diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index ea5863a..ff2c9dd 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -38,7 +38,7 @@ <div ng-if="!globalVariables.create && (tab == 'edit' || tab == 'conf' || tab == 'participant')" ng-controller="PollEditCtrl"> <div ng-include="'./partials/poll-poll.html'" ng-if="tab == 'edit'" class="anim-fade"></div> - <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'" class="anim-fade"></div> + <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'" class="anim-fade poll-settings"></div> <div ng-include="'./partials/poll-listParticipant.html'" ng-if="tab == 'participant'" class="anim-fade"></div> </div> @@ -47,7 +47,7 @@ <div ng-include="'./partials/poll-poll.html'" ng-if="tab == 'create'" class="anim-fade"></div> - <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'" class="anim-fade"></div> + <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'" class="anim-fade poll-settings"></div> <div ng-include="'./partials/poll-listParticipant.html'" ng-if="tab == 'participant'" class="anim-fade"></div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm