=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js 2014-12-15 14:00:36 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js 2015-01-08 16:39:10 +0000 @@ -198,6 +198,8 @@ getByStage: function(orgUnit, programStage, pager){ var pgSize = pager ? pager.pageSize : 50; var pg = pager ? pager.page : 1; + pgSize = pgSize > 1 ? pgSize : 1; + pg = pg > 1 ? pg : 1; var url = '../api/events.json?' + 'orgUnit=' + orgUnit + '&programStage=' + programStage + '&pageSize=' + pgSize + '&page=' + pg; var promise = $http.get( url ).then(function(response){ @@ -311,4 +313,4 @@ return e; } }; -}); +}); \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-01-05 15:31:59 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-01-08 16:39:10 +0000 @@ -468,6 +468,8 @@ if(paging){ var pgSize = pager ? pager.pageSize : 50; var pg = pager ? pager.page : 1; + pgSize = pgSize > 1 ? pgSize : 1; + pg = pg > 1 ? pg : 1; url = url + '&pageSize=' + pgSize + '&page=' + pg; } else{ @@ -795,6 +797,8 @@ getEventReport: function(orgUnit, ouMode, program, startDate, endDate, programStatus, eventStatus, pager){ var pgSize = pager ? pager.pageSize : 50; var pg = pager ? pager.page : 1; + pgSize = pgSize > 1 ? pgSize : 1; + pg = pg > 1 ? pg : 1; var url = '../api/events/eventRows.json?' + 'orgUnit=' + orgUnit + '&ouMode='+ ouMode + '&program=' + program + '&programStatus=' + programStatus + '&eventStatus='+ eventStatus + '&pageSize=' + pgSize + '&page=' + pg; if(startDate && endDate){ url = url + '&startDate=' + startDate + '&endDate=' + endDate ; === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/serverside-pagination.html' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/serverside-pagination.html 2014-12-08 15:56:07 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/serverside-pagination.html 2015-01-08 16:39:10 +0000 @@ -5,10 +5,10 @@ {{'total_number_of_pages'| translate}}: {{pager.pageCount}} - {{'rows_per_page'| translate}}: + {{'rows_per_page'| translate}}: - {{'jump_to_page'| translate}}: + {{'jump_to_page'| translate}}: