[pollen] branch feature/editVote updated (7b8c002 -> 0778ebc)
This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git from 7b8c002 fix edit Choice : if error you can edit or delete the choice new b43ea8c improve message with url for edit vote new 0e8eb23 improve message with url for edit comment new 587c4a0 improve message with url for edit poll new 0778ebc add message with url for clone poll and change order alert The 4 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 0778ebc7e923cef53e2ea2e764e572635a9d40b9 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 14:21:38 2014 +0200 add message with url for clone poll and change order alert commit 587c4a0796392e3d658cb767fa61df15ceb727ce Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 14:13:25 2014 +0200 improve message with url for edit poll commit 0e8eb23ada431de88beeaeec9310a2fe1ed88d7c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 13:57:45 2014 +0200 improve message with url for edit comment commit b43ea8ca4f29b450d67112bbebcf3b4ce89b3d3c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 13:51:29 2014 +0200 improve message with url for edit vote Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 3 ++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 ++ .../src/main/webapp/js/controllers/pollCtrl.js | 63 ++++++++++++++-------- .../src/main/webapp/partials/poll-list.html | 2 +- 4 files changed, 48 insertions(+), 23 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 feature/editVote in repository pollen. See http://git.chorem.org/pollen.git commit b43ea8ca4f29b450d67112bbebcf3b4ce89b3d3c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 13:51:29 2014 +0200 improve message with url for edit vote --- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 11 ++++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 0dfab39..e57511d 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -111,6 +111,7 @@ var translateEN = { 'poll.error.listEmpty' : 'No poll find', 'vote.added' : 'Vote added.', +'vote.added.printLink' : 'You can modify your vote to using this address when you are not connected: {{url}}', 'comment' : 'Comment', 'comment.added' : 'Comment added.', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index fafb37c..ac2978d 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -111,6 +111,7 @@ var translateFR = { 'poll.error.listEmpty' : 'Aucun sondage trouvé', 'vote.added' : 'Vote effectué', +'vote.added.printLink' : 'Garder le lien suivant pour pouvoir modifier votre vote plus tard, lorsque vous n\'êtes pas connecté : {{url}}', 'comment' : 'Commentaire', 'comment.added' : 'Commentaire effectué', 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 a49c11e..22a464e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -1051,8 +1051,8 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr // Vote controller // ////////////////////////////////// -.controller('PollVoteCtrl', ['$scope', '$rootScope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', '$location', 'Page', - function ($scope, $rootScope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate, $location, Page) { +.controller('PollVoteCtrl', ['$scope', '$rootScope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', '$filter', '$location', 'Page', + function ($scope, $rootScope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate, $filter, $location, Page) { $controller('PollAdminChoiceCtrl', {$scope:$scope}); if (angular.isUndefined($scope.globalVariables)) { @@ -1171,9 +1171,10 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr initVote(); $rootScope.$broadcast('newInfo', - '<input type="text" class="form-control" value="' + - $scope.globalVariables.baseUrl+'#/poll/vote/'+$routeParams.pollId+'/'+ returnRequest.permission + - '" readonly />' + $filter('translate')('vote.added.printLink', {url: + '<input type="text" class="form-control" value="' + + $scope.globalVariables.baseUrl+'#/poll/vote/'+$routeParams.pollId+'/'+ returnRequest.permission + + '" readonly />'}) , -1); $location.url('/poll/vote/'+$routeParams.pollId+'/'+ returnRequest.permission); }, function (error) { -- 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 feature/editVote in repository pollen. See http://git.chorem.org/pollen.git commit 0e8eb23ada431de88beeaeec9310a2fe1ed88d7c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 13:57:45 2014 +0200 improve message with url for edit comment --- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index e57511d..e7060f5 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -115,6 +115,7 @@ var translateEN = { 'comment' : 'Comment', 'comment.added' : 'Comment added.', +'comment.added.printLink' : 'You can modify your comment to using this address when you are not connected: {{url}}', 'comment.order.toDesc' : 'Ordered by newer date', 'comment.order.toAsc' : 'Ordered by older date', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index ac2978d..f5c6714 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -115,6 +115,7 @@ var translateFR = { 'comment' : 'Commentaire', 'comment.added' : 'Commentaire effectué', +'comment.added.printLink' : 'Garder le lien suivant pour pouvoir modifier votre commentaire, lorsque vous n\'êtes pas connecté : {{url}}', 'comment.order.toDesc' : 'Ordonner par le plus récent', 'comment.order.toAsc' : 'Ordonner par ordre chronologique', 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 22a464e..0896b82 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -1244,8 +1244,8 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr ////////////////////////////////// .controller('PollCommentCtrl', - ['$scope', '$rootScope', '$controller', '$routeParams', 'Poll', 'PollComment', '$translate', '$timeout', '$location', 'Page', - function ( $scope, $rootScope, $controller, $routeParams, Poll, PollComment, $translate, $timeout, $location, Page) { + ['$scope', '$rootScope', '$controller', '$routeParams', 'Poll', 'PollComment', '$translate', '$filter', '$timeout', '$location', 'Page', + function ( $scope, $rootScope, $controller, $routeParams, Poll, PollComment, $translate, $filter, $timeout, $location, Page) { if (angular.isUndefined($scope.globalVariables)) { $scope.globalVariables = {}; @@ -1336,9 +1336,10 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr $scope.commentToken = data.permission; $rootScope.$broadcast('newInfo', + $filter('translate')('comment.added.printLink', {url : '<input type="text" class="form-control" value="' + $scope.globalVariables.baseUrl+'#/poll/comment/'+$routeParams.pollId+'/'+data.permission + - '" readonly />' + '" readonly />' }) , -1); $location.url('/poll/comment/'+$routeParams.pollId+'/'+data.permission); -- 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 feature/editVote in repository pollen. See http://git.chorem.org/pollen.git commit 587c4a0796392e3d658cb767fa61df15ceb727ce Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 14:13:25 2014 +0200 improve message with url for edit poll --- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + .../src/main/webapp/js/controllers/pollCtrl.js | 27 ++++++++++++++-------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index e7060f5..3ad3439 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -71,6 +71,7 @@ var translateEN = { 'poll.edit' : 'Click to edit', 'poll.desc' : 'Description is optional. This message will not visible in vote page.', 'poll.saved' : 'Poll saved.', +'poll.created.printLink' : 'You can modify your poll to using this address when you are not connected: {{url}}', 'poll.cloned' : 'Poll cloned', 'poll.closed' : 'Poll closed', 'poll.deleted' : 'Poll deleted', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index f5c6714..81e089f 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -71,6 +71,7 @@ var translateFR = { 'poll.edit' : 'Clique pour éditer', 'poll.desc' : 'Description (Facultatif). Ce cadre disparait si aucune description n\'est mise', 'poll.saved' : 'Sondage sauvegardé', +'poll.created.printLink' : 'Garder le lien suivant pour pouvoir modifier votre sondage plus tard, lorsque vous n\'êtes pas connecté : {{url}}', 'poll.cloned' : 'Sondage cloné', 'poll.closed' : 'Sondage clos', 'poll.deleted' : 'Sondage supprimé', 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 0896b82..c78c1a7 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -65,6 +65,14 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr $scope.globalVariables.toDay = new Date(); $scope.globalVariables.minify = $scope.session.menuMinify; + var baseUrl = window.location.protocol+'//'+window.location.hostname; + if (window.location.port != "") { + baseUrl += ':'+window.location.port; + } + baseUrl += window.location.pathname; + + $scope.globalVariables.baseUrl = baseUrl; + /** * Sauvegarde du token si non connecté */ @@ -132,13 +140,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr }) pollDeferred.promise.then(function () { - var baseUrl = window.location.protocol+'//'+window.location.hostname; - if (window.location.port != "") { - baseUrl += ':'+window.location.port; - } - baseUrl += window.location.pathname; - - $scope.globalVariables.baseUrl = baseUrl; + var baseUrl = $scope.globalVariables.baseUrl; $scope.globalVariables.linkHome = baseUrl; $scope.globalVariables.linkVote = baseUrl; $scope.globalVariables.linkComment = baseUrl; @@ -676,8 +678,8 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr // Admin create poll controller // ////////////////////////////////// -.controller('PollCreateCtrl', ['$scope', '$rootScope', '$controller', '$location', 'Poll', 'SessionStorage', 'PollVoterList', 'Page', - function ( $scope, $rootScope, $controller, $location, Poll, SessionStorage, PollVoterList, Page) { +.controller('PollCreateCtrl', ['$scope', '$rootScope', '$controller', '$location', '$filter', 'Poll', 'SessionStorage', 'PollVoterList', 'Page', + function ( $scope, $rootScope, $controller, $location, $filter, Poll, SessionStorage, PollVoterList, Page) { $controller('PollCtrl', {$scope:$scope}); $controller('PollAdminCtrl', {$scope:$scope}); @@ -723,6 +725,13 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr Poll.add(poll, function (data) { $rootScope.$broadcast('newSuccess', 'poll.saved'); + $rootScope.$broadcast('newInfo', + $filter('translate')('poll.created.printLink', {url: + '<input type="text" class="form-control" value="' + + $scope.globalVariables.baseUrl+'#/poll/edit/'+data.id+'/'+data.permission + + '" readonly />' + }) + , -1); if ($scope.data.poll.pollType != 'FREE') { SessionStorage.save({'voterList':$scope.data.voterList}) $location.url('/poll/edit/'+data.id+'/'+data.permission); -- 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 feature/editVote in repository pollen. See http://git.chorem.org/pollen.git commit 0778ebc7e923cef53e2ea2e764e572635a9d40b9 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 14:21:38 2014 +0200 add message with url for clone poll and change order alert --- .../src/main/webapp/js/controllers/pollCtrl.js | 22 +++++++++++++++------- .../src/main/webapp/partials/poll-list.html | 2 +- 2 files changed, 16 insertions(+), 8 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 c78c1a7..72d8ac9 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -31,8 +31,8 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr ////////////////////////////////// .controller('PollCtrl', - ['$scope', '$rootScope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', '$q', 'Poll', 'PollenResource', 'Page', 'DateFormat', - function ( $scope, $rootScope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route, $q, Poll, PollenResource, Page, DateFormat) { + ['$scope', '$rootScope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$filter', '$route', '$q', 'Poll', 'PollenResource', 'Page', 'DateFormat', + function ( $scope, $rootScope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $filter, $route, $q, Poll, PollenResource, Page, DateFormat) { $scope.setTab = function (defaultValue) { if (angular.isDefined($route.current)) { @@ -322,8 +322,15 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr $scope.clonePoll = function () { if (angular.isDefined($scope.data.poll.id)) { Poll.clone({pollId: $scope.data.poll.id, permission: $scope.globalVariables.pollToken}, {}, function (data) { + $rootScope.$broadcast('newInfo', + $filter('translate')('poll.created.printLink', {url: + '<input type="text" class="form-control" value="' + + $scope.globalVariables.baseUrl+'#/poll/edit/'+data.id+'/'+data.permission + + '" readonly />' + }) + , -1); $rootScope.$broadcast('newSuccess', 'poll.cloned'); - $location.url('/poll/edit/'+data.id); + $location.url('/poll/edit/'+data.id+'/'+data.permission); $route.reload(); }); } @@ -724,7 +731,6 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr } Poll.add(poll, function (data) { - $rootScope.$broadcast('newSuccess', 'poll.saved'); $rootScope.$broadcast('newInfo', $filter('translate')('poll.created.printLink', {url: '<input type="text" class="form-control" value="' + @@ -732,6 +738,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr '" readonly />' }) , -1); + $rootScope.$broadcast('newSuccess', 'poll.saved'); if ($scope.data.poll.pollType != 'FREE') { SessionStorage.save({'voterList':$scope.data.voterList}) $location.url('/poll/edit/'+data.id+'/'+data.permission); @@ -1176,15 +1183,16 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr $scope.data.votants.push(newVote); }) - $rootScope.$broadcast('newSuccess', 'vote.added'); - initVote(); - $rootScope.$broadcast('newInfo', $filter('translate')('vote.added.printLink', {url: '<input type="text" class="form-control" value="' + $scope.globalVariables.baseUrl+'#/poll/vote/'+$routeParams.pollId+'/'+ returnRequest.permission + '" readonly />'}) , -1); + + $rootScope.$broadcast('newSuccess', 'vote.added'); + initVote(); + $location.url('/poll/vote/'+$routeParams.pollId+'/'+ returnRequest.permission); }, function (error) { if (angular.isDefined(error.data["voter.name"])) { diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index 7eb9ed2..dd5b175 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -33,7 +33,7 @@ <div ng-bind-html="toHTML(poll.description)"></div> </td> </tr> - <tr ng-show="data.polls.length > 1"> + <tr ng-show="data.polls.length > 0"> <td colspan="3"> <button class="btn btn-default" ng-click="selectAll()"><span class="glyphicon glyphicon-check"></span> {{ 'action.selectAll' | translate }}</button> <button class="btn btn-default" ng-click="unselectAll()"><span class="glyphicon glyphicon-unchecked"></span> {{ 'action.unselectAll' | translate }}</button> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm