[pollen] branch develop updated (5d1b9c1 -> 90b17a3)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 5d1b9c1 add version.txt file with application version in root path of the war new 90b17a3 fix date in poll result The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 90b17a3f0c227445a58e688c68bcfd1aab6daa60 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 10:32:29 2014 +0200 fix date in poll result Summary of changes: pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 2 +- pollen-ui-angular/src/main/webapp/partials/poll-result.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 90b17a3f0c227445a58e688c68bcfd1aab6daa60 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 10:32:29 2014 +0200 fix date in poll result --- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 2 +- pollen-ui-angular/src/main/webapp/partials/poll-result.html | 2 +- 2 files changed, 2 insertions(+), 2 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..dc1be4d 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -1492,7 +1492,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr break; case 'DATE': - scores.push([$filter('date')(value.choice.choiceValue, $scope.globalVariables.dateFormat), value.scoreValue]); + scores.push([$filter('date')(value.choice.choiceValue, $scope.globalVariables.dateTimeFormat), value.scoreValue]); break; case 'RESOURCE': diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-result.html b/pollen-ui-angular/src/main/webapp/partials/poll-result.html index 9e69c58..2e8dff7 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-result.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-result.html @@ -45,7 +45,7 @@ <th>{{ 'poll.result.score' | translate }}</th> </tr> <tr ng-repeat="score in data.result.scores"> - <th> {{ score.choice.choiceValue.meta.name || (score.choice.choiceValue | date:globalVariables.dateFormat) || score.choice.choiceValue }} </th> + <th> {{ score.choice.choiceValue.meta.name || (score.choice.choiceValue | date:globalVariables.dateTimeFormat) || score.choice.choiceValue }} </th> <td> {{score.scoreValue}} </td> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm