[Pollen-commits] 01/03: send permission for getting poll and choices

22 May 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 d2726c6dc728d9a2cc22920df530d3d99fea26f0
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Thu May 22 16:20:51 2014 +0200

    send permission for getting poll and choices
---
 pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 41dd6fc..3bb1029 100644
--- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js
+++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js
@@ -220,7 +220,7 @@ angular.module('pollControllers', [])
   }
 
   $scope.callBackEditChoice = function (choice) {
-    PollChoice.update({permission:$routeParams.token, pollId:$routeParams.pollId}, choice, function() {
+    PollChoice.update({pollId:$routeParams.pollId, permission:$routeParams.token}, choice, function() {
       delete choice.restError;
       $scope.globalVariables.saved = true;
     }, function (error) {
@@ -241,13 +241,13 @@ angular.module('pollControllers', [])
   }
 
   var initPoll = function () {
-    Poll.get({pollId:$routeParams.pollId}).$promise.then(function (poll) {
+    Poll.get({pollId:$routeParams.pollId, permission:$routeParams.token}, function (poll) {
       if (angular.isUndefined(poll.permission)) {
         $location.path('/');
       }
       $scope.data.poll = poll;
     });
-    PollChoice.query({pollId:$routeParams.pollId}).$promise.then(function (choices) {
+    PollChoice.query({pollId:$routeParams.pollId, permission:$routeParams.token}).$promise.then(function (choices) {
       $scope.data.choices = choices;
       $scope.data.vote = {};
       $scope.data.vote.choice = $scope.data.choices;
@@ -285,7 +285,7 @@ angular.module('pollControllers', [])
   $controller('PollCtrl', {$scope:$scope});
 
   var initPoll = function () {
-    Poll.get({pollId:$routeParams.pollId}).$promise.then(function (poll) {
+    Poll.get({pollId:$routeParams.pollId}, function (poll) {
       $scope.data.poll = poll;
     });
     PollChoice.query({pollId:$routeParams.pollId}, function (choices) {

-- 
To stop receiving notification emails like this one, please contact
Chorem.org SCM administrator <admin+scm@chorem.org>.

    

[Pollen-commits] 01/03: send permission for getting poll and choices

Chorem.org scm