diff --git a/BaseModels/paging.py b/BaseModels/paging.py index d1f8168..b80f121 100644 --- a/BaseModels/paging.py +++ b/BaseModels/paging.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- __author__ = 'SDE' -def get_paging_Dict(request, elements_count, elements_on_page, from_page, to_page=None): +def get_paging_Dict(request, elements_count, next_page_els_count, from_page, to_page=None): - pages_count = elements_count / elements_on_page - if elements_count % elements_on_page > 0: + pages_count = elements_count / next_page_els_count + if elements_count % next_page_els_count > 0: pages_count = pages_count + 1 pages = [] diff --git a/static/js/dynamic_loading_routes.js b/static/js/dynamic_loading_routes.js index 0f76d95..d43eb85 100644 --- a/static/js/dynamic_loading_routes.js +++ b/static/js/dynamic_loading_routes.js @@ -3,16 +3,16 @@ standart_page_iterator = 1 separator_iterator = 1 iterator_f_check = 1 -function load_routes (el,news=null) { +function load_routes (el,news=null,incrase) { let local_page_iterator = standart_page_iterator if (!news){ local_page_iterator = page_iterator } let number_last_route = el.id - let incrase = 2 - if (!news){ - incrase = 10 - } + // let incrase = 2 + // if (!news){ + // incrase = 10 + // } let data_d = { 'from_el':parseInt(number_last_route), 'to_el':parseInt(number_last_route) + incrase @@ -58,6 +58,10 @@ function load_routes (el,news=null) { // // + if (data.next_page_els_count){ + document.querySelector(".col_vo_els_f_load").innerHTML = data.next_page_els_count + } + let place_ins_parent = el.closest(".block_w_paging") let place_ins = place_ins_parent.querySelector(`.page_paging_elements_${local_page_iterator}`) // diff --git a/templates/blocks/b_find_route_form.html b/templates/blocks/b_find_route_form.html index d4a0a47..b1a1d9a 100644 --- a/templates/blocks/b_find_route_form.html +++ b/templates/blocks/b_find_route_form.html @@ -19,9 +19,9 @@
- {% if last_block == False %} + {% if last_block == False and next_page_els_count %}
- +
diff --git a/templates/pages/p_articles.html b/templates/pages/p_articles.html index df360bf..37694e8 100644 --- a/templates/pages/p_articles.html +++ b/templates/pages/p_articles.html @@ -36,10 +36,10 @@ {% include 'blocks/articles/b_news_elements_content.html' %} {% endwith %} {# boris edited #} - {% if last_block == False %} + {% if last_block == False and next_page_els_count %}
{% csrf_token %} - +