X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/1d3c54755043df7ce059ee5a445330522c9ebce1..12313cd815102f970c09afc1999d26cec8d99d5c:/catalogue/models.py diff --git a/catalogue/models.py b/catalogue/models.py index f518743..75feba1 100644 --- a/catalogue/models.py +++ b/catalogue/models.py @@ -159,9 +159,9 @@ class Lesson(models.Model): if attachments is None: attachments = {} for attachment in self.attachment_set.all(): - full_name = os.path.join(settings.MEDIA_ROOT, '%s.%s' % (attachment.file.name, attachment.ext)) + full_name = os.path.join(settings.MEDIA_ROOT, attachment.file.name) f = IOFile.from_filename(full_name) - attachments[attachment.slug] = f + 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):