diff --git a/apps/course/models.py b/apps/course/models.py
index 6272a318..63de75ec 100644
--- a/apps/course/models.py
+++ b/apps/course/models.py
@@ -132,7 +132,7 @@ class Course(BaseModel, DeactivatedMixin):
return self.get_absolute_url()
def get_absolute_url(self):
- return reverse_lazy('course', args=[self.id])
+ return reverse_lazy('course', args=[self.slug or self.id])
@property
def is_free(self):
diff --git a/apps/course/templates/course/_items.html b/apps/course/templates/course/_items.html
index ff72a87d..75ef1cd6 100644
--- a/apps/course/templates/course/_items.html
+++ b/apps/course/templates/course/_items.html
@@ -7,7 +7,7 @@
data-course data-course-id={{ course.id }}
{% if course.is_deferred_start and course.status == 2 %}data-future-course data-future-course-time={{ course.deferred_start_at.timestamp }}{% endif %}
>
-
+
{% thumbnail course.cover.image "300x200" crop="center" as im %}
{% empty %}
@@ -53,7 +53,7 @@
{{ course.price|floatformat:"-2" }}₽
{% endif %}
- {{ course.title }}
+ {{ course.title }}
{{ course.short_description | safe | linebreaks | truncatechars_html:300 }}
diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html
index 97f11f84..f64352fb 100644
--- a/apps/course/templates/course/course.html
+++ b/apps/course/templates/course/course.html
@@ -142,7 +142,7 @@
-
Описание курса
+
Описание курса
{% if request.user.is_authenticated %}
{% if course.author == request.user and request.user.role >= request.user.AUTHOR_ROLE %}
diff --git a/apps/payment/templates/payment/payment_success.html b/apps/payment/templates/payment/payment_success.html
index 9d256634..fe3c6a15 100644
--- a/apps/payment/templates/payment/payment_success.html
+++ b/apps/payment/templates/payment/payment_success.html
@@ -11,7 +11,7 @@
{% if course %}
Вы успешно приобрели курс!
{% endif %}
{% if gift_certificate %}
diff --git a/apps/school/models.py b/apps/school/models.py
index 4eb71350..4ba85193 100644
--- a/apps/school/models.py
+++ b/apps/school/models.py
@@ -142,8 +142,12 @@ class LiveLesson(BaseModel, DeactivatedMixin):
self.date = (datetime.combine(self.date, now().time()) + timedelta(days=1)).date()
super().save(*args, **kwargs)
+ @property
+ def url(self):
+ return self.get_absolute_url()
+
def get_absolute_url(self):
- return reverse_lazy('school:lesson-detail', args=[str(self.id)])
+ return reverse_lazy('school:lesson-detail', args=[self.date.strftime('%d-%m-%y')])
def stream_index(self):
return self.stream.split('/')[-1]
diff --git a/apps/school/templates/blocks/open_lesson.html b/apps/school/templates/blocks/open_lesson.html
index 46999c7f..1aefa579 100644
--- a/apps/school/templates/blocks/open_lesson.html
+++ b/apps/school/templates/blocks/open_lesson.html
@@ -1,4 +1,4 @@
смотреть урок
diff --git a/apps/school/templates/school/livelessons_list.html b/apps/school/templates/school/livelessons_list.html
index 237072b0..2f435dcc 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 %}
-
+
diff --git a/apps/school/templates/summer/open_lesson.html b/apps/school/templates/summer/open_lesson.html
index abb8a9a2..793fb589 100644
--- a/apps/school/templates/summer/open_lesson.html
+++ b/apps/school/templates/summer/open_lesson.html
@@ -1,4 +1,4 @@
подробнее
diff --git a/apps/school/urls.py b/apps/school/urls.py
index 59973c6d..c36664f0 100644
--- a/apps/school/urls.py
+++ b/apps/school/urls.py
@@ -13,4 +13,5 @@ urlpatterns = [
path('lessons/create', LiveLessonEditView.as_view(), name='lessons-create'),
path('lessons/
/edit', LiveLessonEditView.as_view(), name='lessons-edit'),
path('lessons//', LiveLessonsDetailView.as_view(), name='lesson-detail'),
+ path('', LiveLessonsDetailView.as_view(), name='lesson-detail'),
]
diff --git a/apps/school/views.py b/apps/school/views.py
index b58869b5..9081acd6 100644
--- a/apps/school/views.py
+++ b/apps/school/views.py
@@ -61,8 +61,11 @@ class LiveLessonsDetailView(DetailView):
model = LiveLesson
template_name = 'school/livelesson_detail.html'
- def get(self, request, pk=None):
- self.object = self.get_object()
+ def get(self, request, pk=None, lesson_date=None):
+ if pk:
+ self.object = self.get_object()
+ if lesson_date:
+ self.object = LiveLesson.objects.get(date=datetime.strptime(lesson_date, '%d-%m-%y'))
if request.user.is_authenticated:
is_purchased = SchoolPayment.objects.filter(
user=request.user,