From f6db94d8d189a43cd9668d3af136401abddabb85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Marquetti=20Jr?= Date: Thu, 12 Jul 2018 12:30:40 -0300 Subject: [PATCH] check for api-metadata --- js/app.js | 22 ++++++++++++---------- template.php | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/js/app.js b/js/app.js index e182927..1816e44 100644 --- a/js/app.js +++ b/js/app.js @@ -100,17 +100,19 @@ function getEvents(){ data: {}, success: function(response, status, xhr) { var meta = JSON.parse(xhr.getResponseHeader("api-metadata")); - jQuery('.pagination .numEntities .outOf').text(meta.count); - jQuery('.pagination .numEntities .from').text(Math.min((((meta.page-1)*meta.limit)+1),meta.count)); - if (meta.page == meta.numPages) - { - jQuery('.pagination .numEntities .to').text(((meta.page-1)*meta.limit)+(meta.count%meta.limit)); - } - else - { - jQuery('.pagination .numEntities .to').text(meta.page*meta.limit); + if (meta != null) { + jQuery('.pagination .numEntities .outOf').text(meta.count); + jQuery('.pagination .numEntities .from').text(Math.min((((meta.page-1)*meta.limit)+1),meta.count)); + if (meta.page == meta.numPages) + { + jQuery('.pagination .numEntities .to').text(((meta.page-1)*meta.limit)+(meta.count%meta.limit)); + } + else + { + jQuery('.pagination .numEntities .to').text(meta.page*meta.limit); + } + jQuery('#list_entities').data('numPages',meta.numPages); } - jQuery('#list_entities').data('numPages',meta.numPages); showEvents(response); }, error: function(xhr,status,response) { diff --git a/template.php b/template.php index 56445d5..44be9ec 100644 --- a/template.php +++ b/template.php @@ -2,7 +2,7 @@ -
> +
data-page="1" >