This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 5a6259b49f696e5488c03725e5ad6793e9b95ffc Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed May 21 16:22:33 2014 +0200 add list poll created --- pollen-ui-angular/src/main/webapp/index.html | 6 +++--- pollen-ui-angular/src/main/webapp/js/app.js | 1 + .../src/main/webapp/js/controllers/pollCtrl.js | 17 +++++++++++++++-- .../src/main/webapp/partials/poll-list.html | 2 ++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 15e254a..4142580 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -43,7 +43,7 @@ </head> <body> -<nav class="navbar navbar-inverse navbar-static-top"> +<nav class="navbar navbar-inverse navbar-static-top" ng-controller="UserLoginCtrl"> <div class="container-fluid"> <div class="navbar-header"> <a class="navbar-brand" href="#">Pollen</a> @@ -51,9 +51,9 @@ <div class="collapse navbar-collapse"> <ul class="nav navbar-nav"> <li><a href="#/poll/create">Creer</a></li> - <li><a href="#/poll/list">Liste</a></li> + <li ng-show="currentUser.login"><a href="#/poll/list/created">Liste</a></li> </ul> - <ul class="nav navbar-nav pull-right" ng-controller="UserLoginCtrl"> + <ul class="nav navbar-nav pull-right"> <li ng-show="!currentUser.login"> <a href="#/user/register/">S'enregistrer</a> </li> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 210685e..f6eaca4 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -53,6 +53,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .when('/poll/edit/:pollId', {templateUrl: './partials/poll.html', controller:"PollEditCtrl"}) .when('/poll/vote/:pollId', {templateUrl: './partials/poll.html', controller :"PollVoteCtrl"}) .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) + .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) .otherwise({redirectTo: '/'}); 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 a607ec8..74b03ec 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -333,10 +333,23 @@ angular.module('pollControllers', []) } }]) -.controller('PollListCtrl', ['$scope', '$controller', 'Poll', function ($scope, $controller, Poll) { +.controller('PollListCtrl', ['$scope', '$controller', '$routeParams', 'Poll', function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); - $scope.data.polls = Poll.query(); + if (angular.isDefined($routeParams.cmd)) { + Poll.query({cmd:$routeParams.cmd}, function (data) { + $scope.data.polls = data; + }, function (error) { + $scope.restError = {forbidden:true}; + }); + } + else { + Poll.query(function (data) { + $scope.data.polls = data; + }, function (error) { + $scope.restError = {forbidden:true}; + }); + } }]) 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 c6b266e..e81774c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -1,4 +1,6 @@ +<alert type="danger" ng-if="restError.forbidden">Accès interdit</alert> + <div ng-repeat="poll in data.polls"> <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}?token={{poll.permission}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> <p ng-bind-html="toHTML(poll.description)"></p> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.