From 34b98ca540b08b934562dabd7e79c964025c1d14 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Wed, 16 Jan 2019 00:17:29 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D1=80=D0=B5=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D1=83=D1=80=D0=BE=D0=BA=D0=BE=D0=B2=20=D0=B2=D0=BE=D0=B7=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=B0=D0=B5=D1=82=20500=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/school/models.py                              | 2 +-
 apps/school/templates/school/livelessons_list.html | 2 +-
 apps/school/urls.py                                | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/school/models.py b/apps/school/models.py
index 4ba85193..38889f44 100644
--- a/apps/school/models.py
+++ b/apps/school/models.py
@@ -147,7 +147,7 @@ class LiveLesson(BaseModel, DeactivatedMixin):
         return self.get_absolute_url()
 
     def get_absolute_url(self):
-        return reverse_lazy('school:lesson-detail', args=[self.date.strftime('%d-%m-%y')])
+        return reverse_lazy('school:lesson-detail', kwargs={'lesson_date': self.date.strftime('%d-%m-%y')})
 
     def stream_index(self):
         return self.stream.split('/')[-1]
diff --git a/apps/school/templates/school/livelessons_list.html b/apps/school/templates/school/livelessons_list.html
index 2f435dcc..161a6629 100644
--- a/apps/school/templates/school/livelessons_list.html
+++ b/apps/school/templates/school/livelessons_list.html
@@ -11,7 +11,7 @@
         {% for livelesson in livelesson_list %}
         <div class="lessons__item">
           <div class="lessons__actions lessons__actions__no-hover">
-            <a target="_blank" class="lessons__action" href="{{ live_lesson.url }}">
+            <a target="_blank" class="lessons__action" href="{{ livelesson.url }}">
               <svg class="icon icon-eye">
                 <use xlink:href="{% static 'img/sprite.svg' %}#icon-eye"></use>
               </svg>
diff --git a/apps/school/urls.py b/apps/school/urls.py
index c36664f0..9ac1d078 100644
--- a/apps/school/urls.py
+++ b/apps/school/urls.py
@@ -1,4 +1,4 @@
-from django.urls import path, include
+from django.urls import path, re_path
 
 from .views import (
     LiveLessonsView, LiveLessonEditView,
@@ -12,6 +12,6 @@ urlpatterns = [
     path('lessons/', LiveLessonsView.as_view(), name='lessons'),
     path('lessons/create', LiveLessonEditView.as_view(), name='lessons-create'),
     path('lessons/<int:pk>/edit', LiveLessonEditView.as_view(), name='lessons-edit'),
-    path('lessons/<int:pk>/', LiveLessonsDetailView.as_view(), name='lesson-detail'),
-    path('<str:lesson_date>', LiveLessonsDetailView.as_view(), name='lesson-detail'),
+    path('lessons/<int:pk>/', LiveLessonsDetailView.as_view(), name='lesson-detail-id'),
+    re_path(r'(?P<lesson_date>\d+\-\d+\-\d+)', LiveLessonsDetailView.as_view(), name='lesson-detail'),
 ]