check for api-metadata

ForaDoEixo · Jul 12, 2018 · f6db94d · f6db94d
1 parent e233a0c
commit f6db94d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git 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
@@ -2,7 +2,7 @@
 <?php if (!empty($mtemplate)) { ?>
 <script id="mustache-template" type="x-tmpl-mustache"><?= $mtemplate; ?></script>
 <?php } ?>
-<div id="list_entities" class="content" data-baseurl="<?= $atts['url']; ?>" data-url="<?= $url; ?>" data-entity="<?= $entity; ?>" data-filters="<?= $filters; ?>" <?= $pagination; ?> <?= $limit; ?>>
+<div id="list_entities" class="content" data-baseurl="<?= $atts['url']; ?>" data-url="<?= $url; ?>" data-entity="<?= $entity; ?>" data-filters="<?= $filters; ?>" <?= $pagination; ?> data-page="1" <?= $limit; ?>>
 	<div class="row top">
 		<?php if (!is_null($filters_input)) { ?>
 		<form id="filters_input"><span class='toggle_filters'></span>