This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 47449ac9d41fa45daf13a09c36a57433081ce176 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Jul 4 10:43:07 2014 +0200 change findByTopiaId() by forTopiaIdEquals().findUnique() --- .../java/org/chorem/pollen/services/service/ChoiceService.java | 2 +- .../java/org/chorem/pollen/services/service/CommentService.java | 4 ++-- .../org/chorem/pollen/services/service/FavoriteListService.java | 4 ++-- .../main/java/org/chorem/pollen/services/service/PollService.java | 2 +- .../java/org/chorem/pollen/services/service/PollenUserService.java | 2 +- .../main/java/org/chorem/pollen/services/service/VoteService.java | 6 +++--- .../java/org/chorem/pollen/services/service/VoterListService.java | 4 ++-- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 7 ++++++- pollen-ui-angular/src/main/webapp/less/style.less | 4 ++-- 9 files changed, 20 insertions(+), 15 deletions(-) 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 1d97812..72852b0 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 @@ -184,7 +184,7 @@ public class ChoiceService extends PollenServiceSupport { protected Choice getChoice(Poll poll, String choiceId) { - Choice result = getChoiceDao().findByTopiaId(choiceId); + Choice result = getChoiceDao().forTopiaIdEquals(choiceId).findUnique(); if (!poll.equals(result.getPoll())) { 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 5ecf45b..c9437d2 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 @@ -146,7 +146,7 @@ public class CommentService extends PollenServiceSupport { protected Comment getComment(Poll poll, String commentId) { - Comment result = getCommentDao().findByTopiaId(commentId); + Comment result = getCommentDao().forTopiaIdEquals(commentId).findUnique(); if (!poll.equals(result.getPoll())) { @@ -177,7 +177,7 @@ public class CommentService extends PollenServiceSupport { if (commentExists) { - toSave = getCommentDao().findByTopiaId(comment.getEntityId()); + toSave = getCommentDao().forTopiaIdEquals(comment.getEntityId()).findUnique(); } else { 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 0e3e8a6..503e32e 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 @@ -290,7 +290,7 @@ public class FavoriteListService extends PollenServiceSupport { protected FavoriteList getFavoriteList0(PollenUser user, String favoriteListId) { - FavoriteList result = getFavoriteListDao().findByTopiaId(favoriteListId); + FavoriteList result = getFavoriteListDao().forTopiaIdEquals(favoriteListId).findUnique(); if (!user.equals(result.getPollenUser())) { @@ -311,7 +311,7 @@ public class FavoriteListService extends PollenServiceSupport { protected FavoriteListMember getFavoriteListMember0(FavoriteList favoriteList, String memberId) { - FavoriteListMember result = getFavoriteListMemberDao().findByTopiaId(memberId); + FavoriteListMember result = getFavoriteListMemberDao().forTopiaIdEquals(memberId).findUnique(); if (!favoriteList.equals(result.getFavoriteList())) { 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 e35d911..6261e08 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 @@ -374,7 +374,7 @@ public class PollService extends PollenServiceSupport { protected Poll getPoll0(String pollId) { - return getPollDao().findByTopiaId(pollId); + return getPollDao().forTopiaIdEquals(pollId).findUnique(); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index 4191c45..484d3c9 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -309,7 +309,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer protected PollenUser getUser0(String userId) { - PollenUser pollenUser = getPollenUserDao().findByTopiaId(userId); + PollenUser pollenUser = getPollenUserDao().forTopiaIdEquals(userId).findUnique(); return pollenUser; } 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 dad35e2..2acc2ad 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 @@ -271,7 +271,7 @@ public class VoteService extends PollenServiceSupport { protected Vote getVote(Poll poll, String voteId) { - Vote result = getVoteDao().findByTopiaId(voteId); + Vote result = getVoteDao().forTopiaIdEquals(voteId).findUnique(); if (!poll.equals(result.getPoll())) { @@ -292,7 +292,7 @@ public class VoteService extends PollenServiceSupport { protected VoteToChoice getVoteToChoice(Vote vote, String voteToChoiceId) { - VoteToChoice result = getVoteToChoiceDao().findByTopiaId(voteToChoiceId); + VoteToChoice result = getVoteToChoiceDao().forTopiaIdEquals(voteToChoiceId).findUnique(); if (!vote.containsVoteToChoice(result)) { @@ -321,7 +321,7 @@ public class VoteService extends PollenServiceSupport { String choiceId = source.getChoiceId().getEntityId(); - Choice choiceLoaded = getChoiceDao().findByTopiaId(choiceId); + Choice choiceLoaded = getChoiceDao().forTopiaIdEquals(choiceId).findUnique(); result.setChoice(choiceLoaded); 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 4fc2f9c..327b8af 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 @@ -333,7 +333,7 @@ public class VoterListService extends PollenServiceSupport { protected VoterList getVoterList0(Poll poll, String voterListId) { - VoterList result = getVoterListDao().findByTopiaId(voterListId); + VoterList result = getVoterListDao().forTopiaIdEquals(voterListId).findUnique(); if (!poll.equals(result.getPoll())) { @@ -366,7 +366,7 @@ public class VoterListService extends PollenServiceSupport { protected VoterListMember getVoterListMember0(VoterList voterList, String memberId) { - VoterListMember result = getVoterListMemberDao().findByTopiaId(memberId); + VoterListMember result = getVoterListMemberDao().forTopiaIdEquals(memberId).findUnique(); if (!voterList.equals(result.getVoterList())) { 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 dd4bbef..e050af6 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -115,7 +115,12 @@ angular.module('pollControllers', []) }) pollDeferred.promise.then(function () { - var baseUrl = window.location.protocol+'//'+window.location.hostname+window.location.pathname; + var baseUrl = window.location.protocol+'//'+window.location.hostname; + if (window.location.port != "") { + baseUrl += ':'+window.location.port; + } + baseUrl += window.location.pathname; + $scope.globalVariables.baseUrl = baseUrl; $scope.globalVariables.linkHome = baseUrl; $scope.globalVariables.linkVote = baseUrl; diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index 13d64d0..8f39e9b 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -311,7 +311,7 @@ color: @danger-color; transition-duration:@short-time-transition; - &:hover { + &:hover, &:focus { color: @danger-hover-color; transition-duration:@short-time-transition; } @@ -320,7 +320,7 @@ a { transition-duration:@short-time-transition; - &:hover { + &:hover, &:focus { transition-duration:@short-time-transition; } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.