X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/8e983105bb2635f3c90e7ddef54be5c36d814df1..5bd425286aab85aa853b3c1ff4e5e730795b299e:/catalogue/models.py?ds=inline diff --git a/catalogue/models.py b/catalogue/models.py index 45284cb..75feba1 100644 --- a/catalogue/models.py +++ b/catalogue/models.py @@ -155,13 +155,13 @@ class Lesson(models.Model): def republish(self, repackage_level=True, attachments=None): from librarian import IOFile import os.path + from django.conf import settings if attachments is None: attachments = {} for attachment in self.attachment_set.all(): - f = IOFile.from_filename(attachment.file.name) - name = os.path.basename(attachment.file.name) - attachments[name.decode('utf-8')] = f - attachments.setdefault(name.replace(" ", "").decode('utf-8'), f) + full_name = os.path.join(settings.MEDIA_ROOT, attachment.file.name) + f = IOFile.from_filename(full_name) + attachments['%s.%s' % (attachment.slug, attachment.ext)] = f infile = IOFile.from_filename(self.xml_file.path, attachments=attachments) Lesson.publish(infile) if repackage_level: @@ -289,7 +289,7 @@ class Lesson(models.Model): return None def requires_internet(self): - return 'internet' in self.dc.get('requires', []) + return any(requirement in self.dc.get('requires', []) for requirement in ('internet', 'Internet')) class Attachment(models.Model):