From 7e3590c6827d021c1654a13ce4a495d4f94117ad Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Mon, 5 Feb 2018 08:22:35 +0300
Subject: [PATCH] Fix backward links

---
 apps/course/templates/course/_items.html | 24 ++++++++++++------------
 apps/course/templates/course/course.html |  2 +-
 apps/course/views.py                     | 11 +++++++++--
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/apps/course/templates/course/_items.html b/apps/course/templates/course/_items.html
index af350f5c..1866fbcb 100644
--- a/apps/course/templates/course/_items.html
+++ b/apps/course/templates/course/_items.html
@@ -6,27 +6,27 @@
     data-course data-course-id={{ course.id }}
     {% if course.is_deferred_start %}data-future-course data-future-course-time={{ course.deferred_start_at.timestamp }}{% endif %}
 >
-  <a class="courses__preview" href="{% url 'course' course.id %}">
-    <img class="courses__pic" src="{{ course.cover.url }}"/>
-    <div class="courses__view">Подробнее</div>
-    {% if course.is_featured %}
-      <div class="courses__label courses__label_fav"></div>
-    {% endif %} {% if course.is_deferred_start %}
-    <div class="courses__soon">
-      <div class="courses__left">Курс начнется:</div>
-      <div class="courses__time">{{ course.deferred_start_at_humanize }}</div>
+<a class="courses__preview" href="{% url 'course' course.id %}?next={{ request.get_full_path }}">
+  <img class="courses__pic" src="{{ course.cover.url }}"/>
+  <div class="courses__view">Подробнее</div>
+  {% if course.is_featured %}
+  <div class="courses__label courses__label_fav"></div>
+  {% endif %} {% if course.is_deferred_start %}
+  <div class="courses__soon">
+    <div class="courses__left">Курс начнется:</div>
+    <div class="courses__time">{{ course.deferred_start_at_humanize }}</div>
     </div>
     <div class="courses__label courses__label_clock"></div>
   {% endif %}
-  </a>
-  <div class="courses__details">
+</a>
+<div class="courses__details">
     <a class="courses__theme theme {{ theme_color }}"
        href="{% url 'courses' %}?category={{ course.category.title }}">{{ course.category | upper }}</a>
     {% if not course.is_free %}
       <div class="courses__price">{{ course.price|floatformat:"-2" }}₽</div>
     {% endif %}
   </div>
-  <a class="courses__title" href="{% url 'course' course.id %}">{{ course.title }}</a>
+  <a class="courses__title" href="{% url 'course' course.id %}?next={{ request.get_full_path }}">{{ course.title }}</a>
   <div class="courses__content">{{ course.short_description }}
   </div>
   <div class="courses__user user">
diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html
index cf994653..2176d023 100644
--- a/apps/course/templates/course/course.html
+++ b/apps/course/templates/course/course.html
@@ -7,7 +7,7 @@
 <div class="section section_border">
   <div class="section__center center center_sm">
     <div class="go">
-      <a class="go__item" href="{% url 'courses' %}">
+      <a class="go__item" href="{% if next %}{{next}}{% else %}{% url 'courses' %}{% endif %}">
         <div class="go__arrow">
           <svg class="icon icon-arrow-left">
             <use xlink:href="{% static '/img/sprite.svg' %}#icon-arrow-left"></use>
diff --git a/apps/course/views.py b/apps/course/views.py
index 7dd8d73b..b9c2b4f8 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -141,6 +141,11 @@ class CourseView(DetailView):
     context_object_name = 'course'
     template_name = 'course/course.html'
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['next'] = self.request.GET.get('next', None)
+        return context
+
 
 class CoursesView(ListView):
     model = Course
@@ -207,9 +212,11 @@ class SearchView(CoursesView):
             queryset = queryset.none()
         return queryset
 
-    def get_context_data(self):
-        context = super().get_context_data()
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
         context['q'] = self.request.GET.get('q', None) or ''
+        context['next'] = self.request.GET.get('next', None)
+        return context
         if 'is_paginated' in context and context['is_paginated']:
             page_obj = context.get('page_obj')
             context['page'] = page_obj.number