This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit c4dc92787eec76dc19890257da9b7475aec4049d Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon May 19 11:29:14 2014 +0200 Complet info locale and token for all services --- .../src/main/webapp/js/controllers/pollCtrl.js | 4 +--- pollen-ui-angular/src/main/webapp/js/services.js | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) 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 99b3134..fc7ee83 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -19,9 +19,7 @@ * #L% */ angular.module('pollControllers', []) -.controller('HomeCtrl', ['$scope', '$locale', '$cookieStore', function ($scope, $locale, $cookieStore) { - - $scope.test = $cookieStore.get('locale'); +.controller('HomeCtrl', ['$scope', function ($scope) { }]) .controller('PollCtrl', ['$scope', '$controller', '$sce', '$timeout', '$cookies', function ($scope, $controller, $sce, $timeout, $cookies) { diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index f2d25fd..4a5306c 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -28,7 +28,7 @@ angular.module('pollenServices', ['ngResource']) } if (angular.isDefined($cookies.token)) { - query += '&token='+$cookies.token; + query += '&permission='+$cookies.token; } query += '&locale='+$cookies.locale; @@ -57,9 +57,9 @@ angular.module('pollenServices', ['ngResource']) }); }]) -.factory('PollChoice', ['$resource', function ($resource) { +.factory('PollChoice', ['$resource', 'RestInfo', function ($resource, RestInfo) { var transformParam = function (data) { - return 'choice='+encodeURIComponent(JSON.stringify(data)); + return 'choice='+encodeURIComponent(JSON.stringify(data))+RestInfo; }; return $resource(conf.restURL+'/polls/:pollId/choices/:choiceId', {choiceId : '@id'}, @@ -81,9 +81,9 @@ angular.module('pollenServices', ['ngResource']) ); }]) -.factory('PollVote', ['$resource', function ($resource) { +.factory('PollVote', ['$resource', 'RestInfo', function ($resource, RestInfo) { var transformParam = function (data) { - return 'vote='+encodeURIComponent(JSON.stringify(data)); + return 'vote='+encodeURIComponent(JSON.stringify(data))+RestInfo; }; return $resource(conf.restURL+'/polls/:pollId/votes/:voteId', {voteId : '@id'}, -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.