From ccb60913831c59b9e823c75b2dd7c33ca2360153 Mon Sep 17 00:00:00 2001
From: Vitaly Baev <dj@vitalybaev.ru>
Date: Thu, 1 Feb 2018 18:26:02 +0300
Subject: [PATCH] =?UTF-8?q?LIL-157=20-=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D1=80=D1=83?=
 =?UTF-8?q?=D0=B7=D0=BA=D0=B0=20=D0=BA=D1=83=D1=80=D1=81=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/course/templates/course/result.html | 2 +-
 apps/course/views.py                     | 2 ++
 web/build/js/app.js                      | 7 ++++++-
 web/src/js/modules/courses.js            | 5 ++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/apps/course/templates/course/result.html b/apps/course/templates/course/result.html
index 5102b318..d639b043 100644
--- a/apps/course/templates/course/result.html
+++ b/apps/course/templates/course/result.html
@@ -23,7 +23,7 @@
             {% include "./course_items.html" %}
           </div>
           <div class="courses__load load">
-            <button class="load__btn btn">Подгрузить еще</button>
+            <button class="load__btn btn" data-next-page-url="/search?q={{ q }}&page={{ next_page }}">Подгрузить еще</button>
           </div>
           {% else %}
           <div class="empty">К сожалению, по вашему запросу ничего не&nbsp;найдено.</div>
diff --git a/apps/course/views.py b/apps/course/views.py
index 2cf2b003..78dcce12 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -210,6 +210,8 @@ class SearchView(CoursesView):
     def get_context_data(self):
         context = super().get_context_data()
         context['q'] = self.request.GET.get('q', None) or ''
+        context['page'] = self.request.GET.get('page', None) or 1
+        context['next_page'] = str(int(context['page']) + 1)
         return context
 
     def get_template_names(self):
diff --git a/web/build/js/app.js b/web/build/js/app.js
index 08b1670a..639e05b9 100644
--- a/web/build/js/app.js
+++ b/web/build/js/app.js
@@ -28475,7 +28475,12 @@ function load_courses(coursesUrl, fromStart) {
                 buttonElement.hide();
             }
         }
-    }).fail(function (xhr) {}).always(function () {
+    }).fail(function (xhr) {
+        if (xhr.status === 404) {
+            // Нет результатов, скрываем кнопку
+            buttonElement.hide();
+        }
+    }).always(function () {
         (0, _jquery2.default)('.courses__list').css('opacity', '1');
         if (buttonElement) {
             buttonElement.removeClass('loading');
diff --git a/web/src/js/modules/courses.js b/web/src/js/modules/courses.js
index 6ddf880d..90c5aa48 100644
--- a/web/src/js/modules/courses.js
+++ b/web/src/js/modules/courses.js
@@ -108,7 +108,10 @@ function load_courses(coursesUrl, fromStart) {
             }
         })
         .fail(function (xhr) {
-
+            if (xhr.status === 404) {
+                // Нет результатов, скрываем кнопку
+                buttonElement.hide();
+            }
         })
         .always(function () {
             $('.courses__list').css('opacity', '1');