- Pollen-commits - mailman.cloud.codelutin.com

01/02: remove permissions + clean service code
by Chorem.org scm May 22, 2014

May 22, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 3d237d9039ebc4fdb41ed9f288d05bf3c8594f60 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 22 08:47:14 2014 +0200 remove permissions + clean service code --- .../pollen/persistence/entity/ChoiceTopiaDao.java | 4 +-- .../pollen/persistence/entity/CommentTopiaDao.java | 15 ++++++++++ .../pollen/persistence/entity/VoteTopiaDao.java | 16 ++++++++++ .../org/chorem/pollen/services/bean/VoteBean.java | 1 - .../pollen/services/service/ChoiceService.java | 25 +++++++++++++--- .../pollen/services/service/CommentService.java | 26 +++++++++++++---- .../services/service/FavoriteListService.java | 32 +++++++++++--------- .../pollen/services/service/PollService.java | 34 ++++++++++++---------- .../services/service/VoteCountingService.java | 1 - .../pollen/services/service/VoteService.java | 25 ++++++++++++---- 10 files changed, 132 insertions(+), 47 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java index 0d19abf..18206e2 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java @@ -21,8 +21,6 @@ package org.chorem.pollen.persistence.entity; * #L% */ -import com.google.common.collect.ImmutableList; - import java.util.List; public class ChoiceTopiaDao extends AbstractChoiceTopiaDao<Choice> { @@ -32,7 +30,7 @@ public class ChoiceTopiaDao extends AbstractChoiceTopiaDao<Choice> { List<Choice> choices = forPollEquals(poll). setOrderByArguments(Choice.PROPERTY_CHOICE_ORDER). findAll(); - return ImmutableList.copyOf(choices); + return choices; } } diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/CommentTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/CommentTopiaDao.java new file mode 100644 index 0000000..f4835cc --- /dev/null +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/CommentTopiaDao.java @@ -0,0 +1,15 @@ +package org.chorem.pollen.persistence.entity; + +import java.util.List; + +public class CommentTopiaDao extends AbstractCommentTopiaDao<Comment> { + + public List<Comment> findAll(Poll poll) { + + List<Comment> comments = forPollEquals(poll) + .setOrderByArguments(Comment.PROPERTY_TOPIA_CREATE_DATE) + .findAll(); + return comments; + + } +} diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java new file mode 100644 index 0000000..e6091e4 --- /dev/null +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java @@ -0,0 +1,16 @@ +package org.chorem.pollen.persistence.entity; + +import java.util.List; + +public class VoteTopiaDao extends AbstractVoteTopiaDao<Vote> { + + public List<Vote> findAll(Poll poll) { + + List<Vote> votes = forPollEquals(poll) + .setOrderByArguments(Vote.PROPERTY_TOPIA_CREATE_DATE) + .findAll(); + return votes; + + } + +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java index e5d99f2..ff99433 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java @@ -8,7 +8,6 @@ import org.chorem.pollen.persistence.entity.VoteToChoice; import org.chorem.pollen.persistence.entity.VoteToChoices; import java.util.ArrayList; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index 719234f..1fa5876 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -52,7 +52,17 @@ public class ChoiceService extends PollenServiceSupport { Poll poll = getPollService().getPoll0(pollId); List<Choice> choices = getChoiceDao().findAll(poll); - return copyAsList(ChoiceBean.class, choices); + List<ChoiceBean> choiceBeans = copyAsList(ChoiceBean.class, choices); + + for (ChoiceBean choiceBean : choiceBeans) { + + if (isNotPermitted(PermissionVerb.editChoice, choiceBean.getId())) { + choiceBean.setPermission(null); + } + + } + + return choiceBeans; } @@ -64,8 +74,14 @@ public class ChoiceService extends PollenServiceSupport { Poll poll = getPollService().getPoll0(pollId); - Choice result = getChoice(poll, choiceId); - return copy(ChoiceBean.class, result); + Choice choice = getChoice(poll, choiceId); + ChoiceBean choiceBean = copy(ChoiceBean.class, choice); + + if (isNotPermitted(PermissionVerb.editChoice, choiceBean.getId())) { + choiceBean.setPermission(null); + } + + return choiceBean; } @@ -90,7 +106,8 @@ public class ChoiceService extends PollenServiceSupport { creator.setEmail(connectedUser.getEmail()); } - return copy(ChoiceBean.class, result); + ChoiceBean choiceBean = copy(ChoiceBean.class, result); + return choiceBean; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java index f20112b..3f5c930 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java @@ -23,6 +23,7 @@ package org.chorem.pollen.services.service; * #L% */ +import com.google.common.collect.ImmutableList; import org.chorem.pollen.persistence.entity.Comment; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollenPrincipal; @@ -45,8 +46,16 @@ public class CommentService extends PollenServiceSupport { checkNotNull(pollId); Poll poll = getPollService().getPoll0(pollId); - List<Comment> comments = getCommentDao().forPollEquals(poll).findAll(); - return copyAsList(CommentBean.class, comments); + List<Comment> comments = getCommentDao().findAll(poll); + List<CommentBean> commentBeans = copyAsList(CommentBean.class, comments); + + for (CommentBean commentBean : commentBeans) { + if (isNotPermitted(PermissionVerb.readComment, commentBean.getId())) { + commentBean.setPermission(null); + } + } + + return commentBeans; } @@ -58,8 +67,14 @@ public class CommentService extends PollenServiceSupport { Poll poll = getPollService().getPoll0(pollId); - Comment result = getComment(poll, commentId); - return copy(CommentBean.class, result); + Comment comment = getComment(poll, commentId); + CommentBean commentBean = copy(CommentBean.class, comment); + + if (isNotPermitted(PermissionVerb.readComment, commentBean.getId())) { + commentBean.setPermission(null); + } + + return commentBean; } @@ -102,7 +117,8 @@ public class CommentService extends PollenServiceSupport { getNotificationService().onCommentEdited(poll, result); - return copy(CommentBean.class, result); + CommentBean commentBean = copy(CommentBean.class, result); + return commentBean; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java index bb8fd68..66bd690 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java @@ -23,6 +23,8 @@ package org.chorem.pollen.services.service; * #L% */ +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; @@ -71,8 +73,9 @@ public class FavoriteListService extends PollenServiceSupport { checkIsConnected(); PollenUser user = getConnectedUser(); - List<FavoriteList> result = user.getFavoriteList(); - return copyAsList(FavoriteListBean.class, result); + List<FavoriteList> favoriteLists = user.getFavoriteList(); + List<FavoriteListBean> favoriteListBeans = copyAsList(FavoriteListBean.class, favoriteLists); + return favoriteListBeans; } @@ -83,8 +86,9 @@ public class FavoriteListService extends PollenServiceSupport { PollenUser user = getConnectedUser(); - FavoriteList result = getFavoriteList(user, favoriteListId); - return copy(FavoriteListBean.class, result); + FavoriteList favoriteList = getFavoriteList(user, favoriteListId); + FavoriteListBean favoriteListBean = copy(FavoriteListBean.class, favoriteList); + return favoriteListBean; } @@ -130,7 +134,8 @@ public class FavoriteListService extends PollenServiceSupport { getNotificationService().onFavoriteListEdited(user, result); - return copy(FavoriteListBean.class, result); + FavoriteListBean favoriteListBean = copy(FavoriteListBean.class, result); + return favoriteListBean; } @@ -159,8 +164,9 @@ public class FavoriteListService extends PollenServiceSupport { FavoriteList favoriteList = getFavoriteList(user, favoriteListId); - Set<FavoriteListMember> member = favoriteList.getMember(); - return copyAsSet(FavoriteListMemberBean.class, member); + Set<FavoriteListMember> members = favoriteList.getMember(); + Set<FavoriteListMemberBean> memberBeans = copyAsSet(FavoriteListMemberBean.class, members); + return memberBeans; } @@ -174,8 +180,9 @@ public class FavoriteListService extends PollenServiceSupport { FavoriteList favoriteList = getFavoriteList(user, favoriteListId); - FavoriteListMember result = getFavoriteListMember(favoriteList, memberId); - return copy(FavoriteListMemberBean.class, result); + FavoriteListMember member = getFavoriteListMember(favoriteList, memberId); + FavoriteListMemberBean memberBean = copy(FavoriteListMemberBean.class, member); + return memberBean; } @@ -225,7 +232,8 @@ public class FavoriteListService extends PollenServiceSupport { FavoriteListMember result = saveFavoriteListMember(favoriteList, member); commit(); - return copy(FavoriteListMemberBean.class, result); + FavoriteListMemberBean memberBean = copy(FavoriteListMemberBean.class, result); + return memberBean; } @@ -331,9 +339,6 @@ public class FavoriteListService extends PollenServiceSupport { reader.close(); - } catch (FileNotFoundException e) { - // should never happens ? - throw new PollenTechnicalException(e); } catch (IOException e) { // should never happens ? throw new PollenTechnicalException(e); @@ -439,6 +444,7 @@ public class FavoriteListService extends PollenServiceSupport { protected FavoriteList getFavoriteList(PollenUser user, String favoriteListId) { FavoriteList result = getFavoriteListDao().findByTopiaId(favoriteListId); + if (!user.containsFavoriteList(result)) { throw new InvalidEntityLinkException(PollenUser.PROPERTY_FAVORITE_LIST, user, result); 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 08c1ada..f0ea7a1 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 @@ -23,7 +23,6 @@ package org.chorem.pollen.services.service; * #L% */ -import com.google.common.collect.ImmutableSet; import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.persistence.entity.Choice; import org.chorem.pollen.persistence.entity.Poll; @@ -51,46 +50,50 @@ import static org.nuiton.i18n.I18n.l; */ public class PollService extends PollenServiceSupport { - public ImmutableSet<PollBean> getPolls() { + public Set<PollBean> getPolls() { checkIsConnected(); checkIsAdmin(); List<Poll> polls = getPollDao().findAll(); - return copyAsSet(PollBean.class, polls); + Set<PollBean> pollBeans = copyAsSet(PollBean.class, polls); + return pollBeans; } - public ImmutableSet<PollBean> getCreatedPolls() { + public Set<PollBean> getCreatedPolls() { checkIsConnected(); PollenUser connectedUser = getConnectedUser(); Set<Poll> polls = getPollDao().findAllCreated(connectedUser); - return copyAsSet(PollBean.class, polls); + Set<PollBean> pollBeans = copyAsSet(PollBean.class, polls); + return pollBeans; } - public ImmutableSet<PollBean> getInvitedPolls() { + public Set<PollBean> getInvitedPolls() { checkIsConnected(); PollenUser connectedUser = getConnectedUser(); Set<Poll> polls = getPollDao().findAllInvited(connectedUser); - return copyAsSet(PollBean.class, polls); + Set<PollBean> pollBeans = copyAsSet(PollBean.class, polls); + return pollBeans; } - public ImmutableSet<PollBean> getParticipatedPolls() { + public Set<PollBean> getParticipatedPolls() { checkIsConnected(); PollenUser connectedUser = getConnectedUser(); Set<Poll> polls = getPollDao().findAllParticipated(connectedUser); - return copyAsSet(PollBean.class, polls); + Set<PollBean> pollBeans = copyAsSet(PollBean.class, polls); + return pollBeans; } @@ -99,15 +102,16 @@ public class PollService extends PollenServiceSupport { checkNotNull(pollId); checkPermission(PermissionVerb.readPoll, pollId); - Poll result = getPoll0(pollId); - - if (isNotPermitted(PermissionVerb.editPoll, pollId)) { + Poll poll = getPoll0(pollId); + PollBean pollBean = copy(PollBean.class, poll); - // remove creator informations - result.setCreator(null); + if (isNotPermitted(PermissionVerb.editPoll, pollBean.getId())) { + pollBean.setPermission(null); + pollBean.setCreatorEmail(null); + pollBean.setCreatorName(null); } - return copy(PollBean.class, result); + return pollBean; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java index 1995ab0..0921474 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java @@ -35,7 +35,6 @@ import org.chorem.pollen.services.bean.PollResultBean; */ public class VoteCountingService extends PollenServiceSupport { - //GET /poll/{pollId}/results public PollResultBean getResult(String pollId) { Preconditions.checkNotNull(pollId); Poll poll = getPollService().getPoll0(pollId); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index f87e237..e9de3e1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@ -53,9 +53,16 @@ public class VoteService extends PollenServiceSupport { checkNotNull(pollId); Poll poll = getPollService().getPoll0(pollId); - //FIXME Use a certain order - List<Vote> votes = getVoteDao().forPollEquals(poll).findAll(); - return copyAsList(VoteBean.class, votes); + List<Vote> votes = getVoteDao().findAll(poll); + List<VoteBean> voteBeans = copyAsList(VoteBean.class, votes); + for (VoteBean voteBean : voteBeans) { + + if (isNotPermitted(PermissionVerb.editVote, voteBean.getId())) { + voteBean.setPermission(null); + } + + } + return voteBeans; } @@ -67,7 +74,13 @@ public class VoteService extends PollenServiceSupport { Poll poll = getPollService().getPoll0(pollId); Vote result = getVote(poll, voteId); - return copy(VoteBean.class, result); + VoteBean voteBean = copy(VoteBean.class, result); + + if (isNotPermitted(PermissionVerb.editVote, voteBean.getId())) { + voteBean.setPermission(null); + } + + return voteBean; } @@ -111,7 +124,8 @@ public class VoteService extends PollenServiceSupport { getNotificationService().onVoteEdited(poll, result); - return copy(VoteBean.class, result); + VoteBean voteBean = copy(VoteBean.class, result); + return voteBean; } @@ -261,5 +275,6 @@ public class VoteService extends PollenServiceSupport { result.setVoteValue(source.getVoteValue()); return result; + } } -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: update libs
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 1e5d9e67574f2d1e7a366d461b274846e62147f0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed May 21 18:31:30 2014 +0200 update libs --- pom.xml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index e159774..1ab4552 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.6</version> + <version>5.0.7</version> </parent> <groupId>org.chorem</groupId> @@ -162,25 +162,26 @@  <webmotionVersion>2.4.1-SNAPSHOT</webmotionVersion> - <nuitonI18nVersion>3.0</nuitonI18nVersion> - <eugenePluginVersion>2.9-SNAPSHOT</eugenePluginVersion> + <nuitonI18nVersion>3.1</nuitonI18nVersion> + <eugenePluginVersion>2.9</eugenePluginVersion> <topiaVersion>3.0-SNAPSHOT</topiaVersion> <nuitonWebVersion>1.16</nuitonWebVersion> - <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> - <h2Version>1.3.173</h2Version> + <h2Version>1.4.178</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <shiroVersion>1.2.2</shiroVersion> - <slf4jVersion>1.7.6</slf4jVersion> + <shiroVersion>1.2.3</shiroVersion> + <slf4jVersion>1.7.7</slf4jVersion> <jettyVersion>9.0.3.v20130506</jettyVersion> - <tomcatEmbedVersion>7.0.47</tomcatEmbedVersion> + <tomcatEmbedVersion>7.0.50</tomcatEmbedVersion> + <tomcatEmbedVersion>8.0.5</tomcatEmbedVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> - <httpCommonsHttpclientVersion>4.2.3</httpCommonsHttpclientVersion> + <httpCommonsHttpclientVersion>4.3.3</httpCommonsHttpclientVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle>  @@ -394,7 +395,7 @@ <dependency> <groupId>com.github.spullara.mustache.java</groupId> <artifactId>compiler</artifactId> - <version>0.8.13</version> + <version>0.8.15</version> </dependency> <!--dependency> @@ -576,12 +577,6 @@ </plugin> <plugin> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils-maven-report-plugin</artifactId> - <version>${nuitonUtilsVersion}</version> - </plugin> - - <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>${projectInfoReportsPluginVersion}</version> </plugin> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: check permission for edit poll
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 9f3004b05b5a0eb9beb831744724e0447c24576d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 18:29:04 2014 +0200 check permission for edit poll --- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 3 +++ 1 file changed, 3 insertions(+) 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 74b03ec..41dd6fc 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -242,6 +242,9 @@ angular.module('pollControllers', []) var initPoll = function () { Poll.get({pollId:$routeParams.pollId}).$promise.then(function (poll) { + if (angular.isUndefined(poll.permission)) { + $location.path('/'); + } $scope.data.poll = poll; }); PollChoice.query({pollId:$routeParams.pollId}).$promise.then(function (choices) { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: complete menu
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 8b32246d284337b9446dfd5d27caeed50cb36e92 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 18:01:11 2014 +0200 complete menu --- pollen-ui-angular/src/main/webapp/index.html | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 4142580..ce64f62 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -43,15 +43,14 @@ </head> <body> -<nav class="navbar navbar-inverse navbar-static-top" ng-controller="UserLoginCtrl"> +<nav class="navbar navbar-inverse navbar-static-top"> <div class="container-fluid"> <div class="navbar-header"> <a class="navbar-brand" href="#">Pollen</a> </div> - <div class="collapse navbar-collapse"> + <div class="collapse navbar-collapse" ng-controller="UserLoginCtrl"> <ul class="nav navbar-nav"> <li><a href="#/poll/create">Creer</a></li> - <li ng-show="currentUser.login"><a href="#/poll/list/created">Liste</a></li> </ul> <ul class="nav navbar-nav pull-right"> <li ng-show="!currentUser.login"> @@ -93,6 +92,21 @@ </li> <li class="divider"></li> + + <li> + <a href="#/poll/list/created"> Sondage Créé </a> + </li> + + <li> + <a href="#/poll/list/participated"> Sondage Participé </a> + </li> + + <li> + <a href="#/poll/list/invited"> Sondage Invité </a> + </li> + + <li class="divider"></li> + <li> <a ng-click="logout()">Deconnexion</a> </li> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/03: delete token in url in list poll
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 5cd7b6570745c7e23075dbb9a064076fac043fde Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 17:45:55 2014 +0200 delete token in url in list poll --- pollen-ui-angular/src/main/webapp/partials/poll-list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index e81774c..1648b0b 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -2,7 +2,7 @@ <alert type="danger" ng-if="restError.forbidden">Accès interdit</alert> <div ng-repeat="poll in data.polls"> - <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}?token={{poll.permission}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> + <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> <p ng-bind-html="toHTML(poll.description)"></p> <hr/> </div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: add list poll created
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 5a6259b49f696e5488c03725e5ad6793e9b95ffc Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 16:22:33 2014 +0200 add list poll created --- pollen-ui-angular/src/main/webapp/index.html | 6 +++--- pollen-ui-angular/src/main/webapp/js/app.js | 1 + .../src/main/webapp/js/controllers/pollCtrl.js | 17 +++++++++++++++-- .../src/main/webapp/partials/poll-list.html | 2 ++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 15e254a..4142580 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -43,7 +43,7 @@ </head> <body> -<nav class="navbar navbar-inverse navbar-static-top"> +<nav class="navbar navbar-inverse navbar-static-top" ng-controller="UserLoginCtrl"> <div class="container-fluid"> <div class="navbar-header"> <a class="navbar-brand" href="#">Pollen</a> @@ -51,9 +51,9 @@ <div class="collapse navbar-collapse"> <ul class="nav navbar-nav"> <li><a href="#/poll/create">Creer</a></li> - <li><a href="#/poll/list">Liste</a></li> + <li ng-show="currentUser.login"><a href="#/poll/list/created">Liste</a></li> </ul> - <ul class="nav navbar-nav pull-right" ng-controller="UserLoginCtrl"> + <ul class="nav navbar-nav pull-right"> <li ng-show="!currentUser.login"> <a href="#/user/register/">S'enregistrer</a> </li> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 210685e..f6eaca4 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -53,6 +53,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .when('/poll/edit/:pollId', {templateUrl: './partials/poll.html', controller:"PollEditCtrl"}) .when('/poll/vote/:pollId', {templateUrl: './partials/poll.html', controller :"PollVoteCtrl"}) .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) + .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) .otherwise({redirectTo: '/'}); 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 a607ec8..74b03ec 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -333,10 +333,23 @@ angular.module('pollControllers', []) } }]) -.controller('PollListCtrl', ['$scope', '$controller', 'Poll', function ($scope, $controller, Poll) { +.controller('PollListCtrl', ['$scope', '$controller', '$routeParams', 'Poll', function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); - $scope.data.polls = Poll.query(); + if (angular.isDefined($routeParams.cmd)) { + Poll.query({cmd:$routeParams.cmd}, function (data) { + $scope.data.polls = data; + }, function (error) { + $scope.restError = {forbidden:true}; + }); + } + else { + Poll.query(function (data) { + $scope.data.polls = data; + }, function (error) { + $scope.restError = {forbidden:true}; + }); + } }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index c6b266e..e81774c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -1,4 +1,6 @@ +<alert type="danger" ng-if="restError.forbidden">Accès interdit</alert> + <div ng-repeat="poll in data.polls"> <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}?token={{poll.permission}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> <p ng-bind-html="toHTML(poll.description)"></p> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: admin menu
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit d34ff74f3d591bf1bd85bdc1304aed9dc23e8799 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 16:22:11 2014 +0200 admin menu --- pollen-ui-angular/src/main/webapp/index.html | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 63a7910..15e254a 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -70,18 +70,30 @@ </div> </li> + <li class="dropdown" ng-show="currentUser.administrator"> + <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"> + Administration <strong class="caret"></strong> + </a> + + <ul class="dropdown-menu" role="menu"> + <li><a href="#/poll/list">Liste Sondages</a></li> + <li><a href="#/user/list">List Users</a></li> + <li><a href="#/conf">Configuration</a></li> + </ul> + </li> + <li class="dropdown" ng-show="currentUser.login"> <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"> {{ currentUser.name || currentUser.login }} <strong class="caret"></strong> </a> <ul class="dropdown-menu" role="menu"> - <li role="presentation"> + <li> <a href="#/user/edit/{{currentUser.id}}">Profile</a> </li> - <li class="divider" role="presentation"></li> - <li role="presentation"> + <li class="divider"></li> + <li> <a ng-click="logout()">Deconnexion</a> </li> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/03: reload page when connect and disconnect
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 837cb4883e893a1d99a57bcdc1a4160e115bddbf Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 16:20:43 2014 +0200 reload page when connect and disconnect --- .../src/main/webapp/js/controllers/userCtrl.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 87a3a70..bf2517f 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -36,7 +36,7 @@ } }]) -.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', function ($scope, UserLogin, UserLogout, User, SessionStorage) { +.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', '$route', function ($scope, UserLogin, UserLogout, User, SessionStorage, $route) { if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; } @@ -44,22 +44,30 @@ $scope.login = function () { UserLogin.login({}, $scope.data.user, function (data) { + SessionStorage.save({'token':data.permission}); + User.get({userId: data.id}, function (user) { $scope.currentUser = user; SessionStorage.save({'user':user}); + + delete $scope.data.user; + // reload page for right user + $route.reload(); }) - SessionStorage.save({'token':data.permission}); }, function (error) { $scope.restError = {connexion : "Erreur sur le nom d'utilisateur ou le mot de passe"}; }); - delete $scope.data.user; } $scope.logout = function () { UserLogout.logout(function (data) { - SessionStorage.remove('token'); - SessionStorage.remove('user'); - delete $scope.currentUser; + // delete user information + SessionStorage.remove('token'); + SessionStorage.remove('user'); + delete $scope.currentUser; + + //reload page for right user + $route.reload(); }) } }]) \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: add security for list all poll
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit ca431872fb0f6fdd5e541f8501083760dd6a9d30 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 15:43:13 2014 +0200 add security for list all poll --- .../main/java/org/chorem/pollen/services/service/PollService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 1530eb1..08c1ada 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 @@ -53,9 +53,8 @@ public class PollService extends PollenServiceSupport { public ImmutableSet<PollBean> getPolls() { - //TODO Push this back when security will be ok -// checkIsConnected(); -// checkIsAdmin(); + checkIsConnected(); + checkIsAdmin(); List<Poll> polls = getPollDao().findAll(); return copyAsSet(PollBean.class, polls); -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: implement list of poll created by user
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit f171433c392ff25771b4c421518ef99c172b25eb Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 15:42:31 2014 +0200 implement list of poll created by user --- .../main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java index 0180b5c..f1f4089 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java @@ -36,8 +36,8 @@ import java.util.Set; public class PollTopiaDao extends AbstractPollTopiaDao<Poll> { public Set<Poll> findAllCreated(PollenUser user) { - //TODO - return Sets.newHashSet(); + List<Poll> polls = forEquals(Poll.PROPERTY_CREATOR + "." + PollenPrincipal.PROPERTY_POLLEN_USER, user).findAll(); + return ImmutableSet.copyOf(polls); } public Set<Poll> findAllInvited(PollenUser user) { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0