This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 50bb88a50e77a7c36dc9d35425ebf466c933297f Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed May 28 15:41:10 2014 +0200 Add default page size in conf --- pollen-ui-angular/src/main/webapp/js/conf.js.exemple | 11 ++++++++++- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple index f3f7975..1291f2c 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple @@ -1,4 +1,13 @@ var conf = { // Rest-API Base Url - restURL : "http://exemple.com/pollen-rest-api/v1" + restURL : "http://exemple.com/pollen-rest-api/v1", + + // Poll number per page + pollDefaultPageSize : 10, + + // Comment number per page + commentDefaultPageSize : 10, + + // Favorite poll number per page + favoriteDefaultPageSize : 15, } \ No newline at end of file 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 0a9165d..58d2b38 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -470,7 +470,7 @@ angular.module('pollControllers', []) } } - $scope.pageSize = 3; + $scope.pageSize = conf.commentDefaultPageSize; $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); var paginationParameter = {pageSize:$scope.pageSize}; @@ -559,7 +559,7 @@ angular.module('pollControllers', []) function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); - $scope.pageSize = 3; + $scope.pageSize = conf.pollDefaultPageSize; $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); var paginationParameter = {pageSize:$scope.pageSize}; -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.