0.7.54

articles paging

ArticlesApp/funcs.py

@@ -29,7 +29,8 @@ def get_articles(art_kwargs, request_Data=None, from_el=None, to_el=None):
 
     Dict = {
         'articles': arts,
-        'last_block': last_block
+        'last_block': last_block,
+        'last_el': to_el
     }
 
     return Dict

ArticlesApp/js_urls.py

@@ -5,6 +5,6 @@ from django.urls import path
 from .js_views import *
 
 urlpatterns = [
-    path('get_articles_block/', get_articles_block_ajax, name='get_articles_block_ajax'),
+
 
 ]

ArticlesApp/js_views.py

@@ -33,7 +33,7 @@ def get_articles_block_ajax(request):
         if 'errors' in Dict:
             return JsonResponse(Dict, status=400)
 
-        html = render_to_string('blocks/b_news_elements.html', Dict, request=request)
+        html = render_to_string('blocks/articles/b_news_elements.html', Dict, request=request)
 
         res_Dict = {
             'html': html,

ArticlesApp/urls_translate.py

@@ -1,9 +1,12 @@
 from django.urls import path
 from .views import *
+from .js_views import *
 
 urlpatterns = [
    path('articles/', ArticlesPageView, name=u'articles'),
    path('articles/<int:year>/', ArticlesPageView, name=u'articles_by_year'),
    path('article/<str:art_url>/', ArticlesOnePageView, name=u'article_one'),
    path('info_page/<str:page_url>/', UserPageView, name=u'user_page'),
+
+   path('get_articles_block/', get_articles_block_ajax, name='get_articles_block_ajax'),
 ]

RoutesApp/funcs.py

@@ -200,7 +200,7 @@ def get_routes_Dict(user=None, data=None):
         routes = routes[:to_el]
     else:
         to_el = 25
-        routes = routes[:25]
+        routes = routes[:to_el]
 
     last_block_routes = False
     if not to_el or to_el >= routes_count:
@@ -231,7 +231,8 @@ def get_routes_Dict(user=None, data=None):
 
         res_Dict.update({
             'routes': routes,
-            'last_block_routes': last_block_routes
+            'last_block_routes': last_block_routes,
+            'last_el': to_el
         })
         return res_Dict
 

templates/pages/p_articles.html

@@ -32,7 +32,7 @@
 
     </div>
     {% with from_el=3 %}
-        {% include 'blocks/static_pages_blocks/b_news_elements.html' %}
+        {% include 'blocks/articles/b_news_elements.html' %}
     {% endwith %}
 {#    boris edited #}
     {% if last_block == False %}