[pollen] branch develop updated (216c9e7 -> da6637e)
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 216c9e7 add release files to redmine new da6637e add error when vote not started 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 da6637e55abedf53af80caa58b88cc0e59f73174 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 27 14:36:01 2014 +0200 add error when vote not started Summary of changes: pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 2 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 +- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 4 ++++ 4 files changed, 7 insertions(+), 3 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 da6637e55abedf53af80caa58b88cc0e59f73174 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 27 14:36:01 2014 +0200 add error when vote not started --- pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 2 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 +- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 93e7fa5..33e2c02 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -21,7 +21,7 @@ "less": "1.7.3", "jqplot-bower": "1.0.8", "moment": "2.8.1", - "bootstrap-datetimepicker": "dralagen/bootstrap-datetimepicker#3.1.2", + "bootstrap-datetimepicker": "dralagen/bootstrap-datetimepicker#3.1.3", "font-awesome": "4.1.0" }, "devDependencies": { diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 8b4e74f..d0a9353 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -147,7 +147,7 @@ var translateEN = { 'poll.config.value.visibility.anonymous' : 'Anonymous', 'poll.config.value.visibility.nobody' : 'Nobody', 'poll.info.closed' : 'Poll is closed', -'poll.info.timeoutVote' : 'Poll is finnish at {{time}}', +'poll.info.timeoutVote' : 'Poll is finnish since {{time}}', 'poll.info.beginVote' : 'Start of voting {{time}}', 'poll.info.endVote' : 'End of voting {{time}}', 'poll.info.noEndDate' : 'No End Date is fixed', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 889ec9d..c4a82b8 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -147,7 +147,7 @@ var translateFR = { 'poll.config.value.visibility.anonymous' : 'Anonyme', 'poll.config.value.visibility.nobody' : 'Personne', 'poll.info.closed' : 'Le Sondage est clos', -'poll.info.timeoutVote' : 'Le Sondage est finis le {{time}}', +'poll.info.timeoutVote' : 'Le Sondage est finis depuis le {{time}}', 'poll.info.beginVote' : 'Début des votes {{time}}', 'poll.info.endVote' : 'Fin des votes {{time}}', 'poll.info.noEndDate' : 'Aucune date de fin de vote fixé.', 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 b2c6dfb..b7a80ee 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -1328,6 +1328,10 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr $rootScope.$broadcast('newError', error.data["vote.limitedVote"][0]); } + if (error.data.hasOwnProperty("poll")) { + $rootScope.$broadcast('newError', error.data["poll"][0]); + } + angular.forEach($scope.data.vote.choice, function (choice) { if (angular.isDefined(error.data["vote.voteValue["+choice.choiceId+"]"])) { choice.restError = error.data["vote.voteValue["+choice.choiceId+"]"]; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm