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" %}
- +
{% else %}
К сожалению, по вашему запросу ничего не найдено.
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');