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

07/13: translate favoriteList
by chorem.org scm 19 Jun '14

19 Jun '14

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 81c9b1aee1425fc334217cdda53b4abebf6bdb48 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 16:20:18 2014 +0200 translate favoriteList --- .../pollen/services/service/FavoriteListService.java | 16 +++++++++------- .../main/resources/i18n/pollen-services_en_GB.properties | 7 +++++++ .../main/resources/i18n/pollen-services_fr_FR.properties | 13 ++++++++++--- pollen-ui-angular/src/main/webapp/i18n/en.js | 15 +++++++++------ pollen-ui-angular/src/main/webapp/i18n/fr.js | 9 +++++++-- .../src/main/webapp/partials/favoriteList-edit.html | 2 +- 6 files changed, 43 insertions(+), 19 deletions(-) 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 82bc433..0e3e8a6 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 @@ -44,6 +44,8 @@ import java.io.File; import java.util.List; import java.util.Set; +import static org.nuiton.i18n.I18n.l; + /** * TODO * @@ -381,7 +383,7 @@ public class FavoriteListService extends PollenServiceSupport { String favoriteListName = favoriteList.getName(); - boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListName, "name can not be empty"); + boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListName, l(getLocale(), "pollen.error.favoriteList.name.empty")); boolean favoriteListExists = favoriteList.isPersisted(); @@ -409,7 +411,7 @@ public class FavoriteListService extends PollenServiceSupport { } boolean nameAdded = favoriteListNames.add(favoriteListName); - check(errors, "name", nameAdded, "name already used by another favorite list"); + check(errors, "name", nameAdded, l(getLocale(), "pollen.error.favoriteList.name.already.used")); } return errors; @@ -443,26 +445,26 @@ public class FavoriteListService extends PollenServiceSupport { } - boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListMember.getName(), "member name can not be empty"); + boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListMember.getName(), l(getLocale(), "pollen.error.favoriteListMember.name.empty")); if (nameNotBlank) { boolean added = memberNames.add(favoriteListMember.getName()); - check(errors, "name", added, "member name already used"); + check(errors, "name", added, l(getLocale(), "pollen.error.favoriteListMember.name.already.used")); } String memberEmail = getCleanMail(favoriteListMember.getEmail()); - boolean emailNotBlank = checkNotBlank(errors, "email", memberEmail, "member email can not be empty"); + boolean emailNotBlank = checkNotBlank(errors, "email", memberEmail, l(getLocale(), "pollen.error.favoriteListMember.email.empty")); if (emailNotBlank) { - boolean emailValid = checkValidEmail(errors, "email", memberEmail, "member email is not valid"); + boolean emailValid = checkValidEmail(errors, "email", memberEmail, l(getLocale(), "pollen.error.favoriteListMember.email.invalid")); if (emailValid) { boolean emailAdded = memberEmails.add(memberEmail); - check(errors, "email", emailAdded, "member email already used in this list"); + check(errors, "email", emailAdded, l(getLocale(), "pollen.error.favoriteListMember.email.already.used")); } diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties index 3eab430..24b79ec 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties @@ -20,6 +20,13 @@ pollen.error.favoriteList.import.csv.invalid.email= pollen.error.favoriteList.import.ldap.already.used.email= pollen.error.favoriteList.import.ldap.already.used.name= pollen.error.favoriteList.import.ldap.invalid.email= +pollen.error.favoriteList.name.already.used=name already used by another favorite list +pollen.error.favoriteList.name.empty=name can not be empty +pollen.error.favoriteListMember.email.already.used=member email already used in this list +pollen.error.favoriteListMember.email.empty=member email can not be empty +pollen.error.favoriteListMember.email.invalid=member email is not valid +pollen.error.favoriteListMember.name.already.used=member name already used +pollen.error.favoriteListMember.name.empty=member name can not be empty pollen.error.poll.choice.mandatory=At least a choice is mandatory pollen.error.poll.commentVisibility.mandatory=comment visiblity is mandatory pollen.error.poll.mismatch.freePoll=cant' have a voter list for a free poll diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties index 1faec5d..c7df00c 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties @@ -11,15 +11,22 @@ pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut pollen.configuration.defaultPollenUserPageSize= pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut lors de la création d'un nouveau sondage pollen.configuration.sessionTimeoutDelay=Temps autorisé d'inactivité avant d'invalider une session utilisateur (en secondes) -pollen.error.choice.choiceNameEmpty=le nom du choix ne peut pas être vide -pollen.error.choice.choiceNameExist=le nom du choix est déjà utilisé sur ce sondage -pollen.error.choice.choiceTypeEmpty=le type du choix doit être défini +pollen.error.choice.choiceNameEmpty=Le nom du choix ne peut pas être vide +pollen.error.choice.choiceNameExist=Le nom du choix est déjà utilisé sur ce sondage +pollen.error.choice.choiceTypeEmpty=Le type du choix doit être défini pollen.error.favoriteList.import.csv.already.used.email= pollen.error.favoriteList.import.csv.already.used.name= pollen.error.favoriteList.import.csv.invalid.email= pollen.error.favoriteList.import.ldap.already.used.email= pollen.error.favoriteList.import.ldap.already.used.name= pollen.error.favoriteList.import.ldap.invalid.email= +pollen.error.favoriteList.name.already.used=Le nom est déjà utilisé par une autre liste +pollen.error.favoriteList.name.empty=Le nom de la liste est obligatoire +pollen.error.favoriteListMember.email.already.used=Le courriel du membre est déjà utilisé dans cette liste +pollen.error.favoriteListMember.email.empty=Le courriel est obligatoire +pollen.error.favoriteListMember.email.invalid=Le courriel du membre est invalide +pollen.error.favoriteListMember.name.already.used=Le nom du membre est déjà utilisé dans cette liste +pollen.error.favoriteListMember.name.empty=Le nom du membre est obligatoire pollen.error.poll.choice.mandatory=Au moins un choix est nécessaire pollen.error.poll.commentVisibility.mandatory=la visibilité des commentaires est obligatoire pollen.error.poll.pollType.mandatory=le type de sondage est obligatoire diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 00ee69b..f878922 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -28,6 +28,7 @@ var translateEN = { 'user.register.success' : 'Register with success', 'user.edit.success' : 'Save with success', 'user.forgotPassword.success' : 'Password send by email', +'user.favoriteList' : 'Favorite list', 'user.error.password.diff' : 'Passwords not equal', 'user.error.mail.notFound' : 'E-mail not found', 'user.error.mail.empty' : 'E-mail can not be empty', @@ -60,7 +61,6 @@ var translateEN = { 'comment' : 'Comment', 'comment.added' : 'Comment added.', - 'action.logout' : 'Logout', 'action.login' : 'Login', 'action.register' : 'Register', @@ -72,15 +72,18 @@ var translateEN = { 'action.delete' : 'Delete', 'action.vote' : 'Vote', 'action.comment' : 'Comment', -'action.restricted.addVoter' : 'Add Voter', -'action.restricted.deleteVoter' : 'Delete Voter', -'action.restricted.addGroup' : 'Add Group', -'action.restricted.deleteGroup' : 'Delete Group', +'action.restricted.addVoter' : 'Add a Voter', +'action.restricted.deleteVoter' : 'Delete the Voter', +'action.restricted.addGroup' : 'Add a Group', +'action.restricted.deleteGroup' : 'Delete the Group', 'action.restricted.notify' : 'Notify', +'action.favoriteList.add' : 'Add favorite list', +'action.favoriteList.delete' : 'Delete the favorite list', +'action.favoriteList.addMember' : 'Add a member', +'action.favoriteList.deleteMember' : 'Delete the member', 'action.message.confirmDelete' : 'Are you sure to delete it?', - 'dateFormat' : 'MM-dd-yy', } diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 78f9297..f710b33 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -28,6 +28,7 @@ var translateFR = { 'user.register.success' : 'Compte enregisté, un mail de validation vient d\'être envoyé..', 'user.edit.success' : 'Modification effectuée..', 'user.forgotPassword.success' : 'Un mail de changement de mot de passe vient d\'être envoyé..', +'user.favoriteList' : 'Liste de Diffusion Favorite', 'user.error.password.diff' : 'Mot de passe différent', 'user.error.mail.notFound' : 'Courriel n\'a pas été trouvé', 'user.error.mail.empty' : 'Courriel ne peux pas être vide', @@ -72,10 +73,14 @@ var translateFR = { 'action.vote' : 'Voter', 'action.comment' : 'Commenter', 'action.restricted.addVoter' : 'Ajouter un Votant', -'action.restricted.deleteVoter' : 'Supprimer un Votant', +'action.restricted.deleteVoter' : 'Supprimer le Votant', 'action.restricted.addGroup' : 'Ajouter un Groupe de Votant', -'action.restricted.deleteGroup' : 'Supprimer un Groupe de Votant', +'action.restricted.deleteGroup' : 'Supprimer le Groupe de Votant', 'action.restricted.notify' : 'Envoyer un mail', +'action.favoriteList.add' : 'Ajouter une liste de diffusion', +'action.favoriteList.delete' : 'Supprimer la liste de diffusion', +'action.favoriteList.addMember' : 'Ajouter un membre', +'action.favoriteList.deleteMember' : 'Supprimer le membre', 'action.message.confirmDelete' : 'Êtes vous sûr de vouloir le supprimer?', diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index 02aa7d0..734ccdc 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -28,7 +28,7 @@ <td ng-class="{'has-error':member.restError.email}"> <input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" tooltip="{{member.restError.email[0]}}" /> </td> - <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);"><span class="glyphicon glyphicon-remove"></span></button></div></td> + <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);" tooltip="{{ 'action.favoriteList.deleteMember' | translate }} "><span class="glyphicon glyphicon-remove"></span></button></div></td> </tr> <tr> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

06/13: add glyphicon in button
by chorem.org scm 19 Jun '14

19 Jun '14

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 418a0322683328fafef4c44c048c83a8dbc83262 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 16:00:39 2014 +0200 add glyphicon in button --- pollen-ui-angular/src/main/webapp/partials/big-poll.html | 2 +- pollen-ui-angular/src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/poll-listParticipant.html | 8 ++++---- pollen-ui-angular/src/main/webapp/partials/poll-poll.html | 4 ++-- pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html | 6 +++--- pollen-ui-angular/src/main/webapp/partials/user-login.html | 2 +- pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html | 2 +- pollen-ui-angular/src/main/webapp/partials/user-register.html | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/big-poll.html b/pollen-ui-angular/src/main/webapp/partials/big-poll.html index c26b877..c78d3f2 100644 --- a/pollen-ui-angular/src/main/webapp/partials/big-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/big-poll.html @@ -62,7 +62,7 @@ </div> <div class="row pollBigChoice"> <div class="col-sm-10"> - <button class="btn btn-info btn-large" ng-click="addChoice()" ng-if="globalVariables.editMode" >Ajouter un choix</button> + <button class="btn btn-info btn-large" ng-click="addChoice()" ng-if="globalVariables.editMode" ><span class="glyphicon glyphicon-plus"></span> Ajouter un choix</button> </div> <div class="col-sm-2"> <button ng-click="inlineVersion()" class="btn btn-default">inline version</button> diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index b7ba9d6..5062f76 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -44,7 +44,7 @@ </div> </div> </td> - <td ng-if="!globalVariables.voted && globalVariables.editMode"><input type="button" class="btn btn-default btn-large" value="+" ng-click="addChoice()"/></td> + <td ng-if="!globalVariables.voted && globalVariables.editMode"><button class="btn btn-default btn-large" ng-click="addChoice()"> <span class="glyphicon glyphicon-plus"></span> </button></td> </tr>  diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index dcf7068..a34bdba 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -60,13 +60,13 @@ <tr> <th colspan="4"> - <button class="btn btn-info" ng-click="addVoter($index);"> {{ 'action.restricted.addVoter' | translate }} </button> - <button class="btn btn-danger" ng-click="deleteVoterList(voterList);" ng-show="voterList.group.id"> {{ 'action.restricted.deleteGroup' | translate }} </button> + <button class="btn btn-info" ng-click="addVoter($index);"> <span class="glyphicon glyphicon-plus"></span> {{ 'action.restricted.addVoter' | translate }} </button> + <button class="btn btn-danger" ng-click="deleteVoterList(voterList);" ng-show="voterList.group.id"> <span class="glyphicon glyphicon-trash"></span> {{ 'action.restricted.deleteGroup' | translate }} </button> </th> </tr> </table> - <button class="btn btn-info" ng-show="data.poll.pollType == 'GROUP'" ng-click="addGroup()">{{ 'action.restricted.addGroup' | translate }}</button> - <button class="btn btn-warning" ng-hide="data.poll.pollType == 'FREE'" disabled>{{ 'action.restricted.notify' | translate }}</button> + <button class="btn btn-info" ng-show="data.poll.pollType == 'GROUP'" ng-click="addGroup()"><span class="glyphicon glyphicon-plus"></span> {{ 'action.restricted.addGroup' | translate }}</button> + <button class="btn btn-warning" ng-hide="data.poll.pollType == 'FREE'" disabled><span class="glyphicon glyphicon-envelope"></span> {{ 'action.restricted.notify' | translate }}</button> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html index a88d3e6..b5e6620 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html @@ -49,10 +49,10 @@ <div ng-if="globalVariables.create"> <hr/> - <button class="btn btn-primary" ng-click="savePoll()">{{ 'action.save' | translate }}</button> + <button class="btn btn-primary" ng-click="savePoll()"><span class="glyphicon glyphicon-save"></span> {{ 'action.save' | translate }}</button> </div> <div ng-if="globalVariables.edit"> <hr/> - <button class="btn btn-danger" ng-click="deletePoll();">{{ 'action.delete' | translate }}</button> + <button class="btn btn-danger" ng-click="deletePoll();"><span class="glyphicon glyphicon-trash"></span> {{ 'action.delete' | translate }}</button> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html index cc659b7..402cf6a 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -62,8 +62,8 @@ </div> </div> <div class="modal-footer"> - <button type="button" class="btn btn-danger" ng-click="deleteChoice(choice)">Supprimer</button> - <button type="button" class="btn btn-default" ng-click="cancelChoice()">Annuler</button> - <button type="button" class="btn btn-primary" ng-click="saveChoice()">Sauvegarder</button> + <button type="button" class="btn btn-danger" ng-click="deleteChoice(choice)"><span class="glyphicon glyphicon-trash"></span> Supprimer</button> + <button type="button" class="btn btn-default" ng-click="cancelChoice()"><span class="glyphicon glyphicon-remove"></span> Annuler</button> + <button type="button" class="btn btn-primary" ng-click="saveChoice()"><span class="glyphicon glyphicon-save"></span> Sauvegarder</button> </div> </form> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-login.html b/pollen-ui-angular/src/main/webapp/partials/user-login.html index 3363889..e3c18fa 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-login.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-login.html @@ -23,7 +23,7 @@ </div> <div class="form-actions"> - <button type="submit" class="btn btn-primary">{{ 'action.login' | translate }}</button> + <button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-log-in"></span>   {{ 'action.login' | translate }}</button> <hr/> <a href="#/user/lostpassword"> {{ 'user.forgotPassword' | translate }}</a> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html index 386f833..fbf6890 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html @@ -40,7 +40,7 @@ <div class="control-group"> <div class="col-sm-5"></div> <div class="col-sm-6"> - <button class="btn btn-primary" type="submit">{{ 'action.recovered' | translate }}</button> + <button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-envelope"></span> {{ 'action.recovered' | translate }}</button> </div> <div class="col-sm-1"></div> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index de3c261..a604231 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -82,7 +82,7 @@ <div class="control-group"> <div class="col-sm-5"></div> <div class="col-sm-6"> - <button class="btn btn-primary" type="submit">{{ 'action.register' | translate }}</button> + <button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-log-in"></span>   {{ 'action.register' | translate }}</button> </div> <div class="col-sm-1"></div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

05/13: print form error, delete favoriteListMember, delete and edit favoriteList
by chorem.org scm 19 Jun '14

19 Jun '14

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 a85b55808d7d9d5f4518b3eaadf8695e6ec4a718 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 15:27:30 2014 +0200 print form error, delete favoriteListMember, delete and edit favoriteList --- .../main/webapp/js/controllers/favoriteListCtrl.js | 22 +++++++++++++++------- .../main/webapp/partials/favoriteList-edit.html | 18 +++++++++++------- .../main/webapp/partials/favoriteList-list.html | 1 + 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js index 246d29a..e1a0f3e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js @@ -49,8 +49,8 @@ angular.module('favoriteListControllers', []) }]) -.controller('FavoriteListEditCtrl', ['$scope', 'FavoriteList', 'FavoriteListMember', '$translate', '$routeParams', '$timeout', '$q', - function ($scope, FavoriteList, FavoriteListMember, $translate, $routeParams, $timeout, $q) { +.controller('FavoriteListEditCtrl', ['$scope', 'FavoriteList', 'FavoriteListMember', '$translate', '$routeParams', '$timeout', '$q', '$location', '$route', + function ($scope, FavoriteList, FavoriteListMember, $translate, $routeParams, $timeout, $q, $location, $route) { $scope.data = {}; var paginationParameter = {pageSize: conf.favoriteListDefaultPageSize}; @@ -114,6 +114,7 @@ angular.module('favoriteListControllers', []) FavoriteListPromise = FavoriteList.add({name:$scope.data.favoriteList.name}, function (data) { $scope.data.favoriteList.id = data.id; delete $scope.data.favoriteList.restError; + $location.url('/favoriteList/'+data.id); }, function (error) { $scope.data.favoriteList.restError = error.data; }).$promise; @@ -148,17 +149,16 @@ angular.module('favoriteListControllers', []) } } - $scope.deleteVoterList = function (voterList) { - if (angular.isDefined(voterList) && angular.isDefined(voterList.group.id)) { + $scope.deleteFavoriteList = function () { + if (angular.isDefined($scope.data.favoriteList.id)) { var confirmMessage; $translate('action.message.confirmDelete').then(function (msg) { confirmMessage = msg; }).then( function () { var confirmDelete = confirm(confirmMessage); if (confirmDelete == true) { - PollVoterList.remove({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:voterList.group.id}, function (data) { - var index = $scope.data.voterList.indexOf(voterList); - $scope.data.voterList.splice(index, 1); + FavoriteList.remove({favoriteListId:$scope.data.favoriteList.id}, function (data) { + $location.url('/favoriteList'); }); } }); @@ -181,4 +181,12 @@ angular.module('favoriteListControllers', []) }); } }; + + var lastRoute = $route.current; + $scope.$on('$locationChangeSuccess', function(event) { + if (lastRoute.$$route.controller == $route.current.$$route.controller) { + $route.current = lastRoute; + } + }); + }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index 257b333..02aa7d0 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -3,13 +3,13 @@ <div> <table class="voterList"> <tr> - <th colspan="2" ng-class="{'has-success':data.favoriteList.id && !data.favoriteList.restError}"> + <th colspan="2" ng-class="{'has-success':data.favoriteList.id && !data.favoriteList.restError, 'has-error':data.favoriteList.restError.name}"> <input type="text" name="group" ng-model="data.favoriteList.name" placeholder="name group" class="form-control" - ng-class="{'has-error':data.favoriteList.restError.name}" + tooltip="{{data.favoriteList.restError.name[0]}}" auto-save="saveFavoriteList()" /> </th> <th class="action"> </th> @@ -22,9 +22,13 @@ </tr> <tr ng-repeat="member in data.favoriteList.members" ng-class="{'has-success':member.id && !member.restError}"> - <td> <div ng-class="{'has-error':member.restError.name}"><input type="text" ng-model="member.name" class="form-control" auto-save="saveMember(member)"/></div></td> - <td> <div ng-class="{'has-error':member.restError.email}"><input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" /></div></td> - <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);"><i class="glyphicon glyphicon-remove"></i></button></div></td> + <td ng-class="{'has-error':member.restError.name}"> + <input type="text" ng-model="member.name" class="form-control" auto-save="saveMember(member)" tooltip="{{member.restError.name[0]}}"/> + </td> + <td ng-class="{'has-error':member.restError.email}"> + <input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" tooltip="{{member.restError.email[0]}}" /> + </td> + <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);"><span class="glyphicon glyphicon-remove"></span></button></div></td> </tr> <tr> @@ -37,8 +41,8 @@ <tr> <th colspan="3"> - <button class="btn btn-info" ng-click="addMember();"> {{ 'action.favoriteList.addMember' | translate }} </button> - <button class="btn btn-danger" ng-click="deleteFavoriteList();" ng-show="favoriteList.id"> {{ 'action.favoriteList.delete' | translate }} </button> + <button class="btn btn-info" ng-click="addMember();"><span class="glyphicon glyphicon-plus"></span> {{ 'action.favoriteList.addMember' | translate }} </button> + <button class="btn btn-danger" ng-click="deleteFavoriteList();" ng-show="data.favoriteList.id"><span class="glyphicon glyphicon-trash"></span> {{ 'action.favoriteList.delete' | translate }} </button> </th> </tr> </table> diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html index 840685a..8d87f3d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html @@ -1,6 +1,7 @@ <h1> {{ 'user.favoriteList' | translate }} </h1> <div> + <a href="#/favoriteList/new"><button class="btn btn-info"><span class="glyphicon glyphicon-plus"></span> {{ 'action.favoriteList.add' | translate }}</button></a> <div ng-repeat="favList in data.favoriteList"> <h2> <a href="#/favoriteList/{{favList.id}}">{{ favList.name }}</a></h2> <hr/> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/13: fix edit and delete favoriteListMember
by chorem.org scm 19 Jun '14

19 Jun '14

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 beae1ab7ab267b55740fb380b31910d148766725 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 15:24:57 2014 +0200 fix edit and delete favoriteListMember --- .../main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java index 71f2150..8adb776 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java @@ -113,16 +113,16 @@ public class FavoriteListApi extends WebMotionController { } - public FavoriteListMemberBean editMember(FavoriteListService favoriteListService, String favoriteListId, FavoriteListMemberBean member) throws InvalidFormException { + public FavoriteListMemberBean editMember(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId, FavoriteListMemberBean member) throws InvalidFormException { - FavoriteListMemberBean editedFavoriteListMember = favoriteListService.editFavoriteListMember(favoriteListId, member); + FavoriteListMemberBean editedFavoriteListMember = favoriteListService.editFavoriteListMember(favoriteListId.getEntityId(), member); return editedFavoriteListMember; } - public void removeMember(FavoriteListService favoriteListService, String favoriteListId, String memberId) { + public void removeMember(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId, PollenEntityId<FavoriteListMember> memberId) { - favoriteListService.deleteFavoriteListMember(favoriteListId, memberId); + favoriteListService.deleteFavoriteListMember(favoriteListId.getEntityId(), memberId.getEntityId()); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/13: List favoriteList and create/edit favoriteListMember
by chorem.org scm 19 Jun '14

19 Jun '14

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 bbc9778b5cf58d1053336f1384f0809bee2097fa Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 17 17:54:36 2014 +0200 List favoriteList and create/edit favoriteListMember --- pollen-ui-angular/src/main/webapp/index.html | 7 + pollen-ui-angular/src/main/webapp/js/app.js | 5 +- .../src/main/webapp/js/conf.js.exemple | 3 + .../main/webapp/js/controllers/favoriteListCtrl.js | 184 +++++++++++++++++++++ pollen-ui-angular/src/main/webapp/js/services.js | 14 +- .../main/webapp/partials/favoriteList-edit.html | 46 ++++++ .../main/webapp/partials/favoriteList-list.html | 12 ++ 7 files changed, 269 insertions(+), 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index f53360b..a40155a 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -48,6 +48,7 @@ <script src="js/services.js"></script> <script src="js/controllers/pollCtrl.js"></script> <script src="js/controllers/userCtrl.js"></script> + <script src="js/controllers/favoriteListCtrl.js"></script> <script src="js/controllers/localeCtrl.js"></script> <script src="i18n/fr.js"></script> @@ -116,6 +117,12 @@ <li class="divider"></li> <li> + <a href="#/favoriteList">{{ 'user.favoriteList' | translate }}</a> + </li> + + <li class="divider"></li> + + <li> <a href="#/poll/list/created"> {{ 'user.listPollCreated' | translate }} </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 726c14a..c367a04 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'pascalprecht.translate']) +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'ui.bootstrap', 'pascalprecht.translate']) .config(['$httpProvider', function($httpProvider) { // edit header for locale and sessionToken $httpProvider.interceptors.push('httpInterceptor'); @@ -67,6 +67,9 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) .when('/user/edit', {templateUrl: './partials/user-edit.html', controller:"UserEditCtrl"}) .when('/user/lostpassword', {templateUrl: './partials/user-lostPassword.html', controller:"UserLostPasswordCtrl"}) + .when('/favoriteList', {templateUrl: './partials/favoriteList-list.html', controller:"FavoriteListCtrl"}) + .when('/favoriteList/new', {templateUrl: './partials/favoriteList-edit.html', controller:"FavoriteListEditCtrl"}) + .when('/favoriteList/:favoriteListId', {templateUrl: './partials/favoriteList-edit.html', controller:"FavoriteListEditCtrl"}) .otherwise({redirectTo: '/'}); }]) diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple index 06021c7..4602e9a 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple @@ -11,6 +11,9 @@ var conf = { // Favorite list number per page favoriteListDefaultPageSize : 15, + // Member in Favorite list number per page + favoriteListMemberDefaultPageSize : 30, + // Default Language for i18n : 'en' or 'fr' defaultLanguage: 'en', } \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js new file mode 100644 index 0000000..246d29a --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js @@ -0,0 +1,184 @@ +/* + * #%L + * Pollen :: UI (Angular) + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +angular.module('favoriteListControllers', []) +.controller('FavoriteListCtrl', ['$scope', 'FavoriteList', 'FavoriteListMember', '$translate', '$routeParams', + function ($scope, FavoriteList, FavoriteListMember, $translate, $routeParams) { + $scope.data = {}; + + var paginationParameter = {pageSize: conf.favoriteListDefaultPageSize}; + if (angular.isDefined($routeParams.page)) { + if (angular.isDefined($routeParams.pageSize)) { + paginationParameter = {pageSize:$routeParams.pageSize}; + $scope.pageSize = $routeParams.pageSize; + } + paginationParameter.pageNumber = $routeParams.page; + } + + $scope.$watch('data.favoriteListPagination.currentPage', function (newVal, oldVal) { + // check if the current page has changed + if (angular.isDefined(oldVal) && newVal != oldVal) { + paginationParameter.pageNumber = $scope.data.favoriteListPagination.currentPage; + initFavoriteList(); + } + }); + + var initFavoriteList = function () { + FavoriteList.get({paginationParameter:paginationParameter}, function (data) { + $scope.data.favoriteList = data.elements; + $scope.data.favoriteListPagination = data.pagination; + }); + }; initFavoriteList(); + +}]) + +.controller('FavoriteListEditCtrl', ['$scope', 'FavoriteList', 'FavoriteListMember', '$translate', '$routeParams', '$timeout', '$q', + function ($scope, FavoriteList, FavoriteListMember, $translate, $routeParams, $timeout, $q) { + $scope.data = {}; + + var paginationParameter = {pageSize: conf.favoriteListDefaultPageSize}; + if (angular.isDefined($routeParams.page)) { + if (angular.isDefined($routeParams.pageSize)) { + paginationParameter = {pageSize:$routeParams.pageSize}; + $scope.pageSize = $routeParams.pageSize; + } + paginationParameter.pageNumber = $routeParams.page; + } + + $scope.$watch('data.favoriteListMemberPagination.currentPage', function (newVal, oldVal) { + // check if the current page has changed + if (angular.isDefined(oldVal) && newVal != paginationParameter.pageNumber) { + paginationParameter.pageNumber = newVal; + initFavoriteListMember(); + } + }); + + if ($routeParams.favoriteListId) { + FavoriteList.get({favoriteListId:$routeParams.favoriteListId}, function (favList) { + $scope.data.favoriteList = favList; + initFavoriteListMember(); + }); + } + else { + $scope.data.favoriteList = {name:'', members: []}; + } + + var initFavoriteListMember = function () { + var deferred = $q.defer(); + FavoriteListMember.get({favoriteListId:$routeParams.favoriteListId, paginationParameter:paginationParameter}, function (members) { + $timeout(function () { + $scope.data.favoriteList.members = members.elements; + $scope.data.favoriteListMemberPagination = members.pagination; + deferred.resolve(); + }, 100); + }); + + return deferred.promise; + } + + $scope.addMember = function () { + if (angular.isDefined($scope.data.favoriteListMemberPagination) && $scope.data.favoriteListMemberPagination.currentPage < $scope.data.favoriteListMemberPagination.lastPage) { + paginationParameter.pageNumber = $scope.data.favoriteListMemberPagination.lastPage; + initFavoriteListMember().then($scope.addMember); + } else { + $scope.data.favoriteList.members.push({name:'', email:''}); + } + }; + + $scope.saveFavoriteList = function () { + var FavoriteListPromise; + if (angular.isDefined($scope.data.favoriteList.id)) { // edit + FavoriteListPromise = FavoriteList.update({id:$scope.data.favoriteList.id, name:$scope.data.favoriteList.name}, function (data) { + delete $scope.data.favoriteList.restError; + }, function (error) { + $scope.data.favoriteList.restError = error.data; + }).$promise; + } else { // Create + FavoriteListPromise = FavoriteList.add({name:$scope.data.favoriteList.name}, function (data) { + $scope.data.favoriteList.id = data.id; + delete $scope.data.favoriteList.restError; + }, function (error) { + $scope.data.favoriteList.restError = error.data; + }).$promise; + } + + return FavoriteListPromise; + }; + + $scope.saveMember = function (member) { + if (member.name != '' && member.email != '') { + if (angular.isDefined($scope.data.favoriteList.id)) { + var memberPromise; + if (angular.isDefined(member.id)) { + memberPromise = FavoriteListMember.update({favoriteListId:$scope.data.favoriteList.id}, member).$promise; + } else { + memberPromise = FavoriteListMember.add({favoriteListId:$scope.data.favoriteList.id}, member).$promise; + } + + memberPromise.then(function (data) { + member.id = data.id; + delete member.restError; + }, function (error) { + member.restError = error.data; + }) + } + else { + // create favoriteList + $scope.saveFavoriteList().then(function () { + $scope.saveMember(member); + }); + } + } + } + + $scope.deleteVoterList = function (voterList) { + if (angular.isDefined(voterList) && angular.isDefined(voterList.group.id)) { + var confirmMessage; + $translate('action.message.confirmDelete').then(function (msg) { + confirmMessage = msg; + }).then( function () { + var confirmDelete = confirm(confirmMessage); + if (confirmDelete == true) { + PollVoterList.remove({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:voterList.group.id}, function (data) { + var index = $scope.data.voterList.indexOf(voterList); + $scope.data.voterList.splice(index, 1); + }); + } + }); + } + }; + + $scope.deleteMember = function (member) { + if (angular.isDefined($scope.data.favoriteList.id)) { + var confirmMessage; + $translate('action.message.confirmDelete').then(function (msg) { + confirmMessage = msg; + }).then( function () { + var confirmDelete = confirm(confirmMessage); + if (confirmDelete == true) { + FavoriteListMember.remove({favoriteListId:$scope.data.favoriteList.id, memberId:member.id}, function (data) { + var index = $scope.data.favoriteList.members.indexOf(member); + $scope.data.favoriteList.members.splice(index, 1); + }); + } + }); + } + }; +}]) diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 332f70e..03579b8 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -259,6 +259,12 @@ angular.module('pollenServices', ['ngResource']) transformRequest: function (data, headersGetter) { return transformParam(data); } + }, + 'update' : { + method:'POST', + transformRequest: function (data, headersGetter) { + return transformParam(data); + } } }) }]) @@ -268,13 +274,19 @@ angular.module('pollenServices', ['ngResource']) return 'member='+encodeURIComponent(JSON.stringify(data)); } - return $resource(conf.restURL+'/favoriteLists/:favoriteListId/members/:memberId', {favoriteListId:'@id'}, + return $resource(conf.restURL+'/favoriteLists/:favoriteListId/members/:memberId', {memberId:'@id'}, { 'add' : { method:'POST', transformRequest: function (data, headersGetter) { return transformParam(data); } + }, + 'update' : { + method:'POST', + transformRequest: function (data, headersGetter) { + return transformParam(data); + } } }) }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html new file mode 100644 index 0000000..257b333 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -0,0 +1,46 @@ +<h1> {{ 'user.favoriteList' | translate }} </h1> + +<div> + <table class="voterList"> + <tr> + <th colspan="2" ng-class="{'has-success':data.favoriteList.id && !data.favoriteList.restError}"> + <input type="text" + name="group" + ng-model="data.favoriteList.name" + placeholder="name group" + class="form-control" + ng-class="{'has-error':data.favoriteList.restError.name}" + auto-save="saveFavoriteList()" /> + </th> + <th class="action"> </th> + </tr> + + <tr> + <th> {{ 'poll.restricted.name' | translate }} </th> + <th> {{ 'poll.restricted.mail' | translate }} </th> + <th class="action"> </th> + </tr> + + <tr ng-repeat="member in data.favoriteList.members" ng-class="{'has-success':member.id && !member.restError}"> + <td> <div ng-class="{'has-error':member.restError.name}"><input type="text" ng-model="member.name" class="form-control" auto-save="saveMember(member)"/></div></td> + <td> <div ng-class="{'has-error':member.restError.email}"><input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" /></div></td> + <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);"><i class="glyphicon glyphicon-remove"></i></button></div></td> + </tr> + + <tr> + <th colspan="3" ng-show="data.favoriteListMemberPagination.lastPage > 0"> + <make-pagination current-page="data.favoriteListMemberPagination.currentPage" + last-page="data.favoriteListMemberPagination.lastPage" + page-size="data.favoriteListMemberPagination.pageSize"></make-pagination> + </th> + </tr> + + <tr> + <th colspan="3"> + <button class="btn btn-info" ng-click="addMember();"> {{ 'action.favoriteList.addMember' | translate }} </button> + <button class="btn btn-danger" ng-click="deleteFavoriteList();" ng-show="favoriteList.id"> {{ 'action.favoriteList.delete' | translate }} </button> + </th> + </tr> + </table> + +</div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html new file mode 100644 index 0000000..840685a --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html @@ -0,0 +1,12 @@ +<h1> {{ 'user.favoriteList' | translate }} </h1> + +<div> + <div ng-repeat="favList in data.favoriteList"> + <h2> <a href="#/favoriteList/{{favList.id}}">{{ favList.name }}</a></h2> + <hr/> + </div> + + <make-pagination current-page="data.favoriteListPagination.currentPage" + last-page="data.favoriteListPagination.lastPage" + page-size="data.favoriteListPagination.pageSize"></make-pagination> +</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

02/13: fix paginationParameter for FavoriteListApi.getMembers
by chorem.org scm 19 Jun '14

19 Jun '14

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 5afd6b88d302a31e29f02873cbff3dc1afcff106 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 17 17:52:34 2014 +0200 fix paginationParameter for FavoriteListApi.getMembers --- .../src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java index 8295bd1..71f2150 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java @@ -92,9 +92,9 @@ public class FavoriteListApi extends WebMotionController { } - public PaginationResultBean<FavoriteListMemberBean> getMembers(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId) { + public PaginationResultBean<FavoriteListMemberBean> getMembers(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId, PaginationParameterBean paginationParameter) { - PaginationResultBean<FavoriteListMemberBean> members = favoriteListService.getFavoriteListMembers(favoriteListId.getEntityId(), null); + PaginationResultBean<FavoriteListMemberBean> members = favoriteListService.getFavoriteListMembers(favoriteListId.getEntityId(), paginationParameter); return members; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/13: add FavoriteList and FavoriteListMember in service
by chorem.org scm 19 Jun '14

19 Jun '14

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 3114d11fdbb7f3849cb85aaf9c581962a9075e44 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 17 11:19:49 2014 +0200 add FavoriteList and FavoriteListMember in service --- pollen-ui-angular/src/main/webapp/js/services.js | 49 ++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index c4dd105..332f70e 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -20,6 +20,10 @@ */ angular.module('pollenServices', ['ngResource']) +////////////////////////////////////// +///// POLL RESOURCE ///// +////////////////////////////////////// + .factory('Poll', ['$resource', function ($resource) { return $resource(conf.restURL+'/polls/:pollId', {pollId:'@id'}, { 'skeletonNew' : { @@ -161,6 +165,10 @@ angular.module('pollenServices', ['ngResource']) }]) +////////////////////////////////////// +///// USER RESOURCE ///// +////////////////////////////////////// + .factory('User', ['$resource', function ($resource) { var transformParam = function (data) { return 'user='+encodeURIComponent(JSON.stringify(data))+'&generatePassword=false'; @@ -234,6 +242,47 @@ angular.module('pollenServices', ['ngResource']) }) }]) + +////////////////////////////////////// +///// FAVORITE LIST RESOURCE ///// +////////////////////////////////////// + +.factory('FavoriteList', ['$resource', function ($resource) { + var transformParam = function (data) { + return 'favoriteList='+encodeURIComponent(JSON.stringify(data)); + } + + return $resource(conf.restURL+'/favoriteLists/:favoriteListId', {favoriteListId:'@id'}, + { + 'add' : { + method:'POST', + transformRequest: function (data, headersGetter) { + return transformParam(data); + } + } + }) +}]) + +.factory('FavoriteListMember', ['$resource', function ($resource) { + var transformParam = function (data) { + return 'member='+encodeURIComponent(JSON.stringify(data)); + } + + return $resource(conf.restURL+'/favoriteLists/:favoriteListId/members/:memberId', {favoriteListId:'@id'}, + { + 'add' : { + method:'POST', + transformRequest: function (data, headersGetter) { + return transformParam(data); + } + } + }) +}]) + +////////////////////////////////////// +///// SESSION STORAGE RESOURCE ///// +////////////////////////////////////// + .factory('SessionStorage', [function () { var storageId='sessionStorage'; var session = JSON.parse(localStorage.getItem(storageId) || '{}'); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: improve load poll
by chorem.org scm 18 Jun '14

18 Jun '14

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 d629debf1d12698a98f52cd2411e80c188a3f259 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 12:01:27 2014 +0200 improve load poll --- pollen-ui-angular/src/main/webapp/js/app.js | 6 +- .../src/main/webapp/js/controllers/pollCtrl.js | 137 +++++++++++---------- 2 files changed, 79 insertions(+), 64 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 1d31b79..726c14a 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -128,7 +128,11 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }); }); - ngModel.$render = function (value) { + ck.on('instanceReady', function() { + ck.setData(ngModel.$modelValue); + }); + + ngModel.$render = function(value) { ck.setData(ngModel.$modelValue); }; } 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 0f20f1c..9eecc06 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -24,8 +24,8 @@ angular.module('pollControllers', []) }]) .controller('PollCtrl', - ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', - function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route) { + ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', '$q', 'Poll', + function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route, $q, Poll) { $scope.setTab = function (defaultValue) { if (angular.isDefined($routeParams.tab)) { return $routeParams.tab; @@ -94,26 +94,47 @@ angular.module('pollControllers', []) $scope.data.poll = {}; if (angular.isDefined($routeParams.pollId)) { - var baseUrl = window.location.origin+window.location.pathname; - $scope.globalVariables.linkVote = baseUrl; - $scope.globalVariables.linkComment = baseUrl; - $scope.globalVariables.linkEdit = baseUrl; - $scope.globalVariables.linkResult = baseUrl; - $scope.globalVariables.linkVote += '#/poll/vote/'+$routeParams.pollId; - $scope.globalVariables.linkComment += '#/poll/comment/'+$routeParams.pollId; - $scope.globalVariables.linkEdit += '#/poll/edit/'+$routeParams.pollId; - $scope.globalVariables.linkResult += '#/poll/result/'+$routeParams.pollId; - - if (angular.isDefined($scope.globalVariables.permission)) { - $scope.globalVariables.linkEdit += '?token='+$scope.globalVariables.permission; - $scope.globalVariables.linkResult += '?token='+$scope.globalVariables.permission; - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'&tab=conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'&tab=participant'; - } - else { - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'?tab=conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'?tab=participant'; - } + var pollDeferred = $q.defer(); + $scope.pollDeferred = pollDeferred; + Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { + $scope.data.poll = poll; + $scope.globalVariables.permission = poll.permission; + pollDeferred.resolve('read-write poll'); + }, function (error) { + Poll.get({pollId:$routeParams.pollId}, function (poll) { + $scope.data.poll = poll; + // clean permission + SessionStorage.remove('permission'); + delete $scope.globalVariables.permission; + + pollDeferred.resolve('read-only poll') + }, function (error) { + pollDeferred.reject(error); + }); + }); + + pollDeferred.promise.then(function () { + var baseUrl = window.location.origin+window.location.pathname; + $scope.globalVariables.linkVote = baseUrl; + $scope.globalVariables.linkComment = baseUrl; + $scope.globalVariables.linkEdit = baseUrl; + $scope.globalVariables.linkResult = baseUrl; + $scope.globalVariables.linkVote += '#/poll/vote/'+$routeParams.pollId; + $scope.globalVariables.linkComment += '#/poll/comment/'+$routeParams.pollId; + $scope.globalVariables.linkEdit += '#/poll/edit/'+$routeParams.pollId; + $scope.globalVariables.linkResult += '#/poll/result/'+$routeParams.pollId; + + if (angular.isDefined($scope.globalVariables.permission)) { + $scope.globalVariables.linkEdit += '?token='+$scope.globalVariables.permission; + $scope.globalVariables.linkResult += '?token='+$scope.globalVariables.permission; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'&tab=conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'&tab=participant'; + } + else { + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'?tab=conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'?tab=participant'; + } + }); } $scope.toHTML = function (data) { @@ -142,8 +163,7 @@ angular.module('pollControllers', []) else { $scope.inlineVersion(); } - } - initTemplateURL(); + }; initTemplateURL(); var lastRoute = $route.current; $scope.$on('$locationChangeSuccess', function(event) { @@ -567,13 +587,7 @@ angular.module('pollControllers', []) //////////////////////////////// var initPoll = function () { - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { - if (angular.isUndefined(poll.permission)) { - $location.path('/'); - } - $scope.data.poll = poll; - initVoterList(); - }); + initVoterList(); PollChoice.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}).$promise.then(function (choices) { $scope.data.choices = choices; @@ -594,8 +608,19 @@ angular.module('pollControllers', []) }) }) }); - } - initPoll(); + }; + $scope.pollDeferred.promise.then(function () { + if (angular.isDefined($scope.data.poll.permission)) { + initPoll(); + delete $scope.pollDeferred; + } else { + $location.path('/'); + } + }, function (error) { + $location.path('/'); + }); + + $scope.autoSavePoll = function () { $scope.savePoll(); @@ -638,10 +663,6 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('vote'); var initPoll = function () { - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { - $scope.data.poll = poll; - }); - PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; initVote(); @@ -754,10 +775,6 @@ angular.module('pollControllers', []) $scope.globalVariables.commentMode = true; - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (data) { - $scope.data.poll = data; - }) - $scope.comment = {text:''}; var initAuthor = function () { if (angular.isDefined($scope.session.user)) { @@ -889,25 +906,26 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('result'); - var pollPromise = Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { - $scope.data.poll = poll; - }).$promise; - - var choicesPromise = PollChoice.query({pollId:$routeParams.pollId}, function (choices) { + var choicesDeferred = $q.defer(); + PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; - }).$promise; + choicesDeferred.resolve('choices load'); + }); - var votesPromise = PollVote.query({pollId:$routeParams.pollId}, function (votes) { + var votesDeferred = $q.defer(); + PollVote.query({pollId:$routeParams.pollId}, function (votes) { $scope.data.votants = votes; - resultPromise.then(function () { + resultDeferred.promise.then(function () { $scope.data.result.nbVotant = $scope.data.votants.length; + votesDeferred.resolve('votes load'); }); - }).$promise; + }); - var resultPromise = Poll.result({pollId:$routeParams.pollId}, function (result) { + var resultDeferred = $q.defer(); + Poll.result({pollId:$routeParams.pollId}, function (result) { $scope.data.result = result; - choicesPromise.then(function () { + choicesDeferred.promise.then(function () { var scoresSorted = []; $scope.data.result.scoreTotal = 0; angular.forEach(result.scores, function(value, key) { @@ -924,10 +942,11 @@ angular.module('pollControllers', []) } }) $scope.data.result.scoresChart = scoresSorted; + resultDeferred.resolve('result load'); }); - }).$promise; + }); - votesPromise.then(function () { + votesDeferred.promise.then(function () { angular.forEach($scope.data.result.scoresChart, function (value, key) { value.push( Math.floor(value[1] * 100 / $scope.data.result.scoreTotal) + '% - '+value[1]+' Vote(s)'); }); @@ -954,15 +973,7 @@ angular.module('pollControllers', []) } var initPolls = function () { - var pollPromise; - if (angular.isDefined($routeParams.cmd)) { - pollPromise = Poll.get({cmd:$routeParams.cmd, paginationParameter:paginationParameter}).$promise; - } - else { - pollPromise = Poll.get({paginationParameter:paginationParameter}).$promise; - } - - pollPromise.then(function (data) { + Poll.get({paginationParameter:paginationParameter}, function (data) { $scope.data.polls = data.elements $scope.data.pollsPagination = data.pagination; }, function (error) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: improve load poll
by chorem.org scm 18 Jun '14

18 Jun '14

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 914b05a691a008381d9e9220c6483df3333a19ee Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 12:01:27 2014 +0200 improve load poll --- pollen-ui-angular/src/main/webapp/js/app.js | 4 +- .../src/main/webapp/js/controllers/pollCtrl.js | 137 +++++++++++---------- 2 files changed, 76 insertions(+), 65 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 1d31b79..aea01ff 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -128,9 +128,9 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }); }); - ngModel.$render = function (value) { + ck.on('instanceReady', function() { ck.setData(ngModel.$modelValue); - }; + }); } }; }) 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 0f20f1c..9eecc06 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -24,8 +24,8 @@ angular.module('pollControllers', []) }]) .controller('PollCtrl', - ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', - function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route) { + ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', '$q', 'Poll', + function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route, $q, Poll) { $scope.setTab = function (defaultValue) { if (angular.isDefined($routeParams.tab)) { return $routeParams.tab; @@ -94,26 +94,47 @@ angular.module('pollControllers', []) $scope.data.poll = {}; if (angular.isDefined($routeParams.pollId)) { - var baseUrl = window.location.origin+window.location.pathname; - $scope.globalVariables.linkVote = baseUrl; - $scope.globalVariables.linkComment = baseUrl; - $scope.globalVariables.linkEdit = baseUrl; - $scope.globalVariables.linkResult = baseUrl; - $scope.globalVariables.linkVote += '#/poll/vote/'+$routeParams.pollId; - $scope.globalVariables.linkComment += '#/poll/comment/'+$routeParams.pollId; - $scope.globalVariables.linkEdit += '#/poll/edit/'+$routeParams.pollId; - $scope.globalVariables.linkResult += '#/poll/result/'+$routeParams.pollId; - - if (angular.isDefined($scope.globalVariables.permission)) { - $scope.globalVariables.linkEdit += '?token='+$scope.globalVariables.permission; - $scope.globalVariables.linkResult += '?token='+$scope.globalVariables.permission; - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'&tab=conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'&tab=participant'; - } - else { - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'?tab=conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'?tab=participant'; - } + var pollDeferred = $q.defer(); + $scope.pollDeferred = pollDeferred; + Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { + $scope.data.poll = poll; + $scope.globalVariables.permission = poll.permission; + pollDeferred.resolve('read-write poll'); + }, function (error) { + Poll.get({pollId:$routeParams.pollId}, function (poll) { + $scope.data.poll = poll; + // clean permission + SessionStorage.remove('permission'); + delete $scope.globalVariables.permission; + + pollDeferred.resolve('read-only poll') + }, function (error) { + pollDeferred.reject(error); + }); + }); + + pollDeferred.promise.then(function () { + var baseUrl = window.location.origin+window.location.pathname; + $scope.globalVariables.linkVote = baseUrl; + $scope.globalVariables.linkComment = baseUrl; + $scope.globalVariables.linkEdit = baseUrl; + $scope.globalVariables.linkResult = baseUrl; + $scope.globalVariables.linkVote += '#/poll/vote/'+$routeParams.pollId; + $scope.globalVariables.linkComment += '#/poll/comment/'+$routeParams.pollId; + $scope.globalVariables.linkEdit += '#/poll/edit/'+$routeParams.pollId; + $scope.globalVariables.linkResult += '#/poll/result/'+$routeParams.pollId; + + if (angular.isDefined($scope.globalVariables.permission)) { + $scope.globalVariables.linkEdit += '?token='+$scope.globalVariables.permission; + $scope.globalVariables.linkResult += '?token='+$scope.globalVariables.permission; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'&tab=conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'&tab=participant'; + } + else { + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'?tab=conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'?tab=participant'; + } + }); } $scope.toHTML = function (data) { @@ -142,8 +163,7 @@ angular.module('pollControllers', []) else { $scope.inlineVersion(); } - } - initTemplateURL(); + }; initTemplateURL(); var lastRoute = $route.current; $scope.$on('$locationChangeSuccess', function(event) { @@ -567,13 +587,7 @@ angular.module('pollControllers', []) //////////////////////////////// var initPoll = function () { - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { - if (angular.isUndefined(poll.permission)) { - $location.path('/'); - } - $scope.data.poll = poll; - initVoterList(); - }); + initVoterList(); PollChoice.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}).$promise.then(function (choices) { $scope.data.choices = choices; @@ -594,8 +608,19 @@ angular.module('pollControllers', []) }) }) }); - } - initPoll(); + }; + $scope.pollDeferred.promise.then(function () { + if (angular.isDefined($scope.data.poll.permission)) { + initPoll(); + delete $scope.pollDeferred; + } else { + $location.path('/'); + } + }, function (error) { + $location.path('/'); + }); + + $scope.autoSavePoll = function () { $scope.savePoll(); @@ -638,10 +663,6 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('vote'); var initPoll = function () { - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { - $scope.data.poll = poll; - }); - PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; initVote(); @@ -754,10 +775,6 @@ angular.module('pollControllers', []) $scope.globalVariables.commentMode = true; - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (data) { - $scope.data.poll = data; - }) - $scope.comment = {text:''}; var initAuthor = function () { if (angular.isDefined($scope.session.user)) { @@ -889,25 +906,26 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('result'); - var pollPromise = Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { - $scope.data.poll = poll; - }).$promise; - - var choicesPromise = PollChoice.query({pollId:$routeParams.pollId}, function (choices) { + var choicesDeferred = $q.defer(); + PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; - }).$promise; + choicesDeferred.resolve('choices load'); + }); - var votesPromise = PollVote.query({pollId:$routeParams.pollId}, function (votes) { + var votesDeferred = $q.defer(); + PollVote.query({pollId:$routeParams.pollId}, function (votes) { $scope.data.votants = votes; - resultPromise.then(function () { + resultDeferred.promise.then(function () { $scope.data.result.nbVotant = $scope.data.votants.length; + votesDeferred.resolve('votes load'); }); - }).$promise; + }); - var resultPromise = Poll.result({pollId:$routeParams.pollId}, function (result) { + var resultDeferred = $q.defer(); + Poll.result({pollId:$routeParams.pollId}, function (result) { $scope.data.result = result; - choicesPromise.then(function () { + choicesDeferred.promise.then(function () { var scoresSorted = []; $scope.data.result.scoreTotal = 0; angular.forEach(result.scores, function(value, key) { @@ -924,10 +942,11 @@ angular.module('pollControllers', []) } }) $scope.data.result.scoresChart = scoresSorted; + resultDeferred.resolve('result load'); }); - }).$promise; + }); - votesPromise.then(function () { + votesDeferred.promise.then(function () { angular.forEach($scope.data.result.scoresChart, function (value, key) { value.push( Math.floor(value[1] * 100 / $scope.data.result.scoreTotal) + '% - '+value[1]+' Vote(s)'); }); @@ -954,15 +973,7 @@ angular.module('pollControllers', []) } var initPolls = function () { - var pollPromise; - if (angular.isDefined($routeParams.cmd)) { - pollPromise = Poll.get({cmd:$routeParams.cmd, paginationParameter:paginationParameter}).$promise; - } - else { - pollPromise = Poll.get({paginationParameter:paginationParameter}).$promise; - } - - pollPromise.then(function (data) { + Poll.get({paginationParameter:paginationParameter}, function (data) { $scope.data.polls = data.elements $scope.data.pollsPagination = data.pagination; }, function (error) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: fix : delete error value for Access-Control-Allow-Origin: *, *
by chorem.org scm 18 Jun '14

18 Jun '14

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 c015c621f9ad511e5307dfd000d30aac3dc8c163 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 10:22:25 2014 +0200 fix : delete error value for Access-Control-Allow-Origin: *, * --- .../src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java index f95df3a..84ec254 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java @@ -55,8 +55,8 @@ public class PollenRestApiUtil { public static void prepareResponse(HttpContext context) { HttpServletResponse response = context.getResponse(); - response.addHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, "*"); - response.addHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS, "true"); + response.setHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, "*"); + response.setHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS, "true"); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0