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 602c1be1d67e1a5f0c66265271aa86a72db48f3e Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Jun 6 12:16:48 2014 +0200 fix url tab in poll form --- .../src/main/webapp/js/controllers/pollCtrl.js | 12 +++++----- .../main/webapp/partials/poll-listParticipant.html | 27 ++++++++++++++++++---- 2 files changed, 28 insertions(+), 11 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 b6078c1..eb3953b 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -104,14 +104,14 @@ angular.module('pollControllers', []) $scope.globalVariables.linkResult += '#/poll/result/'+$routeParams.pollId; if (angular.isDefined($scope.globalVariables.permission)) { - $scope.globalVariables.linkEdit += 'token='+$scope.globalVariables.permission; - $scope.globalVariables.linkResult += 'token='+$scope.globalVariables.permission; - $scope.globalVariables.linkConf = '#/poll/edit/'+$routeParams.pollId+'&tab=conf'; - $scope.globalVariables.linkParticipant = '#/poll/edit/'+$routeParams.pollId+'&tab=participant'; + $scope.globalVariables.linkEdit += '?token='+$scope.globalVariables.permission; + $scope.globalVariables.linkResult += '?token='+$scope.globalVariables.permission; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'&tab=conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'&tab=participant'; } else { - $scope.globalVariables.linkConf = '#/poll/edit/'+$routeParams.pollId+'?tab=conf'; - $scope.globalVariables.linkParticipant = '#/poll/edit/'+$routeParams.pollId+'?tab=participant'; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'?tab=conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'?tab=participant'; } } diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index 81185c7..014211f 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -1,7 +1,25 @@ -{{ data.voterList }} - +<!-- + #%L + Pollen :: UI (Angular) + %% + Copyright (C) 2009 - 2014 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> <h2>{{ 'poll.restricted.pollType' | translate }}</h2> -<form> +<div> <label for="formFree"> <input type="radio" ng-model="data.poll.pollType" name="type" value="FREE" id="formFree" auto-save="savePoll()"/> {{ 'poll.restricted.free' | translate }} @@ -41,5 +59,4 @@ </table> <button class="btn btn-info" ng-show="data.poll.pollType == 'GROUP'" ng-click="addGroup()">Add group</button> - -</form> +</div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.