zmiana kolejnosci w menu

[edumed.git] / curriculum / models.py

diff --git a/curriculum/models.py b/curriculum/models.py
index b4d8ac4..a5d531f 100644 (file)
--- a/curriculum/models.py
+++ b/curriculum/models.py
@@ -3,8 +3,12 @@ import re
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.translation import ugettext_lazy as _, get_language
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.translation import ugettext_lazy as _, get_language

+from fnpdjango.storage import BofhFileSystemStorage

 from fnpdjango.utils.models.translation import add_translatable
 
 from fnpdjango.utils.models.translation import add_translatable
 

+bofh_storage = BofhFileSystemStorage()
+
+

 class Section(models.Model):
     slug = models.SlugField(_('slug'))
     order = models.IntegerField(_('order'))
 class Section(models.Model):
     slug = models.SlugField(_('slug'))
     order = models.IntegerField(_('order'))


@@ -70,9 +74,9 @@ class Level(models.Model):
     meta_name = models.CharField(_('meta name'), max_length=255, unique=True)
     order = models.IntegerField(_('order'))
     package = models.FileField(upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s.zip" % i.slug,
     meta_name = models.CharField(_('meta name'), max_length=255, unique=True)
     order = models.IntegerField(_('order'))
     package = models.FileField(upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s.zip" % i.slug,

-        null=True, blank=True, max_length=255)
+        null=True, blank=True, max_length=255, storage=bofh_storage)

     student_package = models.FileField(upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s_uczen.zip" % i.slug,
     student_package = models.FileField(upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s_uczen.zip" % i.slug,

-        null=True, blank=True, max_length=255)
+        null=True, blank=True, max_length=255, storage=bofh_storage)

 
     class Meta:
         ordering = ['order']
 
     class Meta:
         ordering = ['order']


@@ -92,13 +96,13 @@ class Level(models.Model):
         from StringIO import StringIO
         import zipfile
         from django.core.files.base import ContentFile
         from StringIO import StringIO
         import zipfile
         from django.core.files.base import ContentFile

-        from catalogue.templatetags.catalogue_tags import section_box
+        from catalogue.templatetags.catalogue_tags import level_box

         from catalogue.models import Lesson
 
         buff = StringIO()
         zipf = zipfile.ZipFile(buff, 'w', zipfile.ZIP_STORED)
 
         from catalogue.models import Lesson
 
         buff = StringIO()
         zipf = zipfile.ZipFile(buff, 'w', zipfile.ZIP_STORED)
 

-        lessons = section_box(self)['lessons']
+        lessons = level_box(self)['lessons']

         for i, lesson in enumerate(lessons['synthetic']):
             prefix = 'Skrocony kurs/%d %s/' % (i, lesson.slug)
             lesson.add_to_zip(zipf, student, prefix)
         for i, lesson in enumerate(lessons['synthetic']):
             prefix = 'Skrocony kurs/%d %s/' % (i, lesson.slug)
             lesson.add_to_zip(zipf, student, prefix)


@@ -107,7 +111,7 @@ class Level(models.Model):
                 prefix = 'Pelny kurs/%d %s/%d %s/' % (c, section.slug, i, lesson.slug)
                 lesson.add_to_zip(zipf, student, prefix)
         for i, lesson in enumerate(lessons['project']):
                 prefix = 'Pelny kurs/%d %s/%d %s/' % (c, section.slug, i, lesson.slug)
                 lesson.add_to_zip(zipf, student, prefix)
         for i, lesson in enumerate(lessons['project']):

-            prefix = 'Kurs skrocony/%d %s/' % (i, lesson.slug)
+            prefix = 'Projekty/%d %s/' % (i, lesson.slug)

             lesson.add_to_zip(zipf, student, prefix)
         # Add all appendix lessons, from all levels.
         for lesson in Lesson.objects.exclude(type__in=('synthetic', 'course', 'project')):
             lesson.add_to_zip(zipf, student, prefix)
         # Add all appendix lessons, from all levels.
         for lesson in Lesson.objects.exclude(type__in=('synthetic', 'course', 'project')):