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 d3a66fccd63101da4f9bde59a1d0e9f3142b5ec6 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jul 7 12:43:36 2014 +0200 fix test : bad name error --- .../java/org/chorem/pollen/services/service/PollServiceTest.java | 4 ++-- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java index e3c43d2..448e5a8 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java @@ -169,7 +169,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { Assert.fail(); } catch (InvalidFormException e) { // missing choice name - assertErrorKeyFound(e, "choice[0].name"); + assertErrorKeyFound(e, "choice[0].value"); } choice1.setValue("A"); @@ -187,7 +187,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { Assert.fail(); } catch (InvalidFormException e) { // duplicated choice name - assertErrorKeyFound(e, "choice[1].name"); + assertErrorKeyFound(e, "choice[1].value"); } choice2.setValue("B"); 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 4f2620b..8395de8 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -510,7 +510,6 @@ angular.module('pollControllers', []) poll.choice = angular.copy($scope.data.choices); angular.forEach(poll.choice, function(choice) { - console.log(choice); if (choice.choiceType == 'DATE') { choice.value = choice.value.getTime(); } @@ -932,6 +931,12 @@ angular.module('pollControllers', []) } var pollChoicePromise = PollChoice.query({pollId:$routeParams.pollId}, function (choices) { + angular.forEach(choices, function (ch) { + if (ch.choiceType == 'DATE') { + ch.value = new Date(Number(ch.value)); + } + }); + $scope.data.choices = choices; }).$promise; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.