add privacy link, another contact form

[edumed.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index c684ab5..e20d58c 100644 (file)
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -7,10 +7,10 @@ from curriculum.models import Level, Curriculum, CurriculumCourse
 
 class Section(models.Model):
     title = models.CharField(max_length=255, unique=True)
-    slug = models.SlugField(unique=True)
+    slug = models.SlugField(max_length=255, unique=True)
     order = models.IntegerField()
     xml_file = models.FileField(upload_to="catalogue/section/xml",
-        null=True, blank=True)
+        null=True, blank=True, max_length=255)
 
     class Meta:
         ordering = ['order']
@@ -67,24 +67,24 @@ class Lesson(models.Model):
     section = models.ForeignKey(Section, null=True, blank=True)
     level = models.ForeignKey(Level)
     title = models.CharField(max_length=255)
-    slug = models.SlugField(unique=True)
+    slug = models.SlugField(max_length=255, unique=True)
     type = models.CharField(max_length=15, db_index=True)
     order = models.IntegerField(db_index=True)
     dc = JSONField(default='{}')
     curriculum_courses = models.ManyToManyField(CurriculumCourse)
 
     xml_file = models.FileField(upload_to="catalogue/lesson/xml",
-        null=True, blank=True) # FIXME: slug in paths
+        null=True, blank=True, max_length=255)
     html_file = models.FileField(upload_to="catalogue/lesson/html",
-        null=True, blank=True)
+        null=True, blank=True, max_length=255)
     package = models.FileField(upload_to="catalogue/lesson/pack",
-        null=True, blank=True)
+        null=True, blank=True, max_length=255)
     student_package = models.FileField(upload_to="catalogue/lesson/student_pack",
-        null=True, blank=True)
+        null=True, blank=True, max_length=255)
     pdf = models.FileField(upload_to="catalogue/lesson/pdf",
-        null=True, blank=True)
+        null=True, blank=True, max_length=255)
     student_pdf = models.FileField(upload_to="catalogue/lesson/student_pdf",
-        null=True, blank=True)
+        null=True, blank=True, max_length=255)
 
     class Meta:
         ordering = ['section', 'level', 'order']
@@ -144,26 +144,28 @@ class Lesson(models.Model):
                 courses.add(curr.course)
         self.curriculum_courses = courses
 
-    def build_html(self, infile=None):
+    def wldocument(self, infile=None):
+        from librarian import IOFile
         from librarian.parser import WLDocument
-        from .publish import HtmlFormat, OrmDocProvider
+        from .publish import OrmDocProvider
 
         if infile is None:
-            wldoc = WLDocument.from_file(self.xml_file.path, provider=OrmDocProvider)
-        else:
-            wldoc = WLDocument(infile, provider=OrmDocProvider())
+            infile = IOFile.from_filename(self.xml_file.path)
+            for att in self.attachment_set.all():
+                infile.attachments["%s.%s" % (att.slug, att.ext)] = \
+                    IOFile.from_filename(att.file.path)
+        return WLDocument(infile, provider=OrmDocProvider())
+
+    def build_html(self, infile=None):
+        from .publish import HtmlFormat
+        wldoc = self.wldocument(infile)
         html = HtmlFormat(wldoc).build()
         self.html_file.save("%s.html" % self.slug,
             File(open(html.get_filename())))
 
     def build_pdf(self, student=False, infile=None):
-        from librarian.parser import WLDocument
-        from .publish import PdfFormat, OrmDocProvider
-
-        if infile is None:
-            wldoc = WLDocument.from_file(self.xml_file.path, provider=OrmDocProvider)
-        else:
-            wldoc = WLDocument(infile, provider=OrmDocProvider())
+        from .publish import PdfFormat
+        wldoc = self.wldocument(infile)
         if student:
             pdf = PdfFormat(wldoc).build()
             self.student_pdf.save("%s.pdf" % self.slug,