Merge remote-tracking branch 'origin/feature/pirati-cz' into feature/pirati-cz-bugfixes

main/models.py

@@ -218,7 +218,7 @@ class MainHomePage(
         ).content
         data = {
             "html": html_content.decode("utf-8"),
-            "last_page": tweet_page.paginator.num_pages,
+            "has_next": tweet_page.has_next(),
         }
         return JsonResponse(data=data, safe=False)
 
@@ -388,7 +388,7 @@ class MainArticlesPage(
         ).content
         data = {
             "html": html_content.decode("utf-8"),
-            "last_page": article_page.paginator.num_pages,
+            "has_next": article_page.has_next(),
         }
         return JsonResponse(data=data, safe=False)
 

main/templates/main/blocks/twitter_block.html

@@ -42,7 +42,7 @@
     const data = await response.json()
 
     tweetsList.innerHTML += data.html;
-    if (btn.getAttribute('data-page') === data.last_page) { btn.hide() }
+    if (!data.has_next) { btn.style.display = 'none'; }
 
     const dataPage = parseInt(btn.getAttribute('data-page')) + 1
     btn.setAttribute('data-page', dataPage)

main/templates/main/main_articles_page.html

@@ -120,8 +120,7 @@
       })
       const data = await response.json()
       searchArticleResultWrapper.innerHTML += data.html;
-      if (btn.getAttribute('data-page') === data.last_page)
-        btn.hide();
+      if (!data.has_next) { btn.style.display = 'none'; }
       btn.setAttribute('data-page', parseInt(btn.getAttribute('data-page')) + 1)
     }
   </script>