From e6276a857e5e940258b006456b8665bc9d0eeb45 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Tue, 18 Dec 2018 17:38:21 +0300
Subject: [PATCH] =?UTF-8?q?LIL-728=20=D0=91=D0=B5=D1=81=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B5=D1=87=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=B4=D0=B3=D1=80=D1=83?=
 =?UTF-8?q?=D0=B6=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20=D0=BA=D1=83=D1=80=D1=81?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/course/templates/course/courses.html | 4 +---
 web/src/js/modules/courses.js             | 9 ++++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/course/templates/course/courses.html b/apps/course/templates/course/courses.html
index 7959ba95..afeba814 100644
--- a/apps/course/templates/course/courses.html
+++ b/apps/course/templates/course/courses.html
@@ -56,9 +56,7 @@
           {% include "course/course_items.html" %}
         </div>
         <div class="courses__load load">
-          {% if page_obj.has_next %}
-          <button class="load__btn btn" data-next-page="{{ page_obj.next_page_number }}">Показать еще</button>
-          {% endif %}
+          <button class="load__btn btn" {% if not page_obj.has_next %}style="display: none;"{% endif %}>Показать еще</button>
         </div>
       </div>
     </div>
diff --git a/web/src/js/modules/courses.js b/web/src/js/modules/courses.js
index 9996167e..0208df54 100644
--- a/web/src/js/modules/courses.js
+++ b/web/src/js/modules/courses.js
@@ -32,7 +32,7 @@ $(document).ready(function () {
 
     // Обработчик кнопки "Подгрузить еще"
     $('.courses').on('click', 'button.load__btn', function () {
-        page = $(this).attr('data-next-page');
+        page++;
         loadCourses();
     });
 
@@ -116,13 +116,13 @@ $(document).ready(function () {
         $('.courses__list').css('opacity', '0.9');
         const buttonElement = $('.courses').find('button.load__btn');
         let coursesUrl = window.LIL_STORE.urls.courses + '?' + $.param({
-                category: category,
-                age: age,
+                category,
+                age,
             });
         if (page > 1) {
             buttonElement.addClass('loading');
         }
-        else{
+        if(replaceHistory){
             history.replace(coursesUrl);
         }
         coursesUrl += `&page=${page}`;
@@ -137,7 +137,6 @@ $(document).ready(function () {
                         $('.courses__list').html(data.content);
                     }
                     if (data.next_url) {
-                        buttonElement.attr('data-next-page-url', data.next_url);
                         buttonElement.show();
                     } else {
                         buttonElement.hide()