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 212307d594b9ef3cadc54ae10e5ac839aa61c140 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 13:30:51 2014 +0200 fix permission on new vote, and fix date in new choice --- 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 7632638..c8268fe 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -351,7 +351,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr } $scope.globalVariables.lastType = 'TEXT'; - $scope.globalVariables.lastDate = null; + $scope.globalVariables.lastDate = new Date(); var initChoice = function () { return { @@ -492,7 +492,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr } // set default date - if (angular.isUndefined(choice.choiceValueDate)) { + if (angular.isUndefined(choice.choiceValueDate) || choice.choiceValueDate == "") { choice.choiceValueDate = $scope.globalVariables.lastDate; } @@ -514,7 +514,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr } else if (choice.choiceType == 'DATE') { choice.choiceValue = choice.choiceValueDate; - $scope.globalVariables.lastDate = angular.copy(choice.choiceValueDate); + $scope.globalVariables.lastDate = new Date(choice.choiceValueDate); modalCallBack(choiceEdit, choice, callBack) } @@ -1181,7 +1181,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr } }); - PollVote.get({pollId:$routeParams.pollId, voteId:returnRequest.id}, function (newVote) { + PollVote.get({pollId:$routeParams.pollId, voteId:returnRequest.id, permission:returnRequest.permission}, function (newVote) { $scope.data.votants.push(newVote); }) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.