02/03: add link for edit vote
This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 53a5d768f8691d24aa12106c8373a4cd258fca8e Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri May 23 13:19:31 2014 +0200 add link for edit vote --- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 3 +++ pollen-ui-angular/src/main/webapp/partials/inline-poll.html | 3 +++ 2 files changed, 6 insertions(+) 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 16cf767..43ebe0d 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -347,6 +347,9 @@ angular.module('pollControllers', []) }); PollVote.add({pollId:$routeParams.pollId}, sendVote, function (returnRequest) { + $scope.data.vote.id = returnRequest.id; + $scope.data.vote.permission = returnRequest.permission; + $scope.data.votants.push(angular.copy($scope.data.vote)); $scope.globalVariables.saved = true; initVote(); diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index 9decf83..9d18149 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -69,6 +69,9 @@ <td ng-repeat="choice in vote.choice" class="pollChoice"> <input type="checkbox" ng-model="choice.voteValue" disabled /> </td> + <td> + <a href="#/poll/vote/{{data.poll.id}}" ng-if="vote.permission"><span class="glyphicon glyphicon-pencil"></span></a> + </td> </tr> <!-- end print vote --> </table> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
Chorem.org scm