X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/1a798a8611063ff9abc2b8cd9104e45580f7bffd..965a0bef5bcde07b7df2ac1b07f73ce67105b8a6:/catalogue/views.py?ds=sidebyside

diff --git a/catalogue/views.py b/catalogue/views.py
index 273bfa3..4f9d78c 100644
--- a/catalogue/views.py
+++ b/catalogue/views.py
@@ -1,17 +1,18 @@
-import os.path
-from django.conf import settings
+# -*- coding: utf-8 -*-
 from django.views.generic import DetailView, ListView
-from .models import Lesson, Section
 
+from curriculum.models import Level
+from publishers.models import Publisher
+from .models import Lesson
 
-class SectionView(ListView):
-    model = Section
+
+class LessonListView(ListView):
+    queryset = Level.objects.exclude(lesson=None)
+    template_name = "catalogue/lesson_list.html"
 
     def get_context_data(self, **kwargs):
-        context = super(SectionView, self).get_context_data(**kwargs)
+        context = super(LessonListView, self).get_context_data(**kwargs)
         context['appendix'] = Lesson.objects.filter(type='appendix')
-        context['package_url'] = os.path.join(settings.MEDIA_URL, settings.CATALOGUE_PACKAGE)
-        context['package_student_url'] = os.path.join(settings.MEDIA_URL, settings.CATALOGUE_PACKAGE_STUDENT)
         return context
 
 
@@ -23,4 +24,12 @@ class LessonView(DetailView):
             'catalogue/lesson/%s/lesson_detail.html' % self.object.type,
             'catalogue/lesson/lesson_detail.html',
         ]
-        
+
+    def get_context_data(self, **kwargs):
+        context = super(LessonView, self).get_context_data(**kwargs)
+        try:
+            context['publisher'] = Publisher.objects.get(
+                name=context['object'].dc.get('publisher', '').strip())
+        except (Publisher.DoesNotExist, Publisher.MultipleObjectsReturned):
+            pass
+        return context