Add Filer prefix to django-filer contents

matthiask · matthiask · commit e09cfcafe1cd · 2015-08-23T16:21:30.000+02:00
diff --git a/feincms/contents.py b/feincms/contents.py
@@ -162,7 +162,7 @@ class MediaFileContentInline(FeinCMSInline):
 
     class ContentWithFilerFile(models.Model):
         """
-        MediaFile Content for use with Django-Filer.
+        File content
         """
         feincms_item_editor_inline = MediaFileContentInline
 
@@ -179,7 +179,7 @@ def render(self, **kwargs):
                 'content/filer/default.html',
             ], ctx, context_instance=kwargs.get('context'))
 
-    class FileContent(ContentWithFilerFile):
+    class FilerFileContent(ContentWithFilerFile):
         mediafile = FilerFileField(verbose_name=_('file'), related_name='+')
         file_type = 'file'
         type = 'download'
@@ -189,16 +189,16 @@ class Meta:
             verbose_name = _('file')
             verbose_name_plural = _('files')
 
-    class ImageContent(ContentWithFilerFile):
+    class FilerImageContent(ContentWithFilerFile):
         """
         Create a media file content as follows::
 
-            from feincms.content.medialibrary.v2 import MediaFileContent
-            Page.create_content_type(MediaFileContent, TYPE_CHOICES=(
+            from feincms.contents import FilerImageContent
+            Page.create_content_type(FilerImageContent, TYPE_CHOICES=(
                 ('inline', _('Default')),
                 ('lightbox', _('Lightbox')),
                 ('whatever', _('Whatever')),
-                ))
+            ))
 
         For a media file of type 'image' and type 'lightbox', the following
         templates are tried in order:
diff --git a/feincms/management/commands/medialibrary_to_filer.py b/feincms/management/commands/medialibrary_to_filer.py
@@ -4,20 +4,24 @@
 from django.core.management.base import NoArgsCommand
 from django.contrib.auth.models import User
 
-from feincms.contents import MediaFileContent, FileContent, ImageContent
+from feincms.contents import (
+    MediaFileContent, FilerFileContent, FilerImageContent,
+)
 from feincms.module.medialibrary.models import MediaFile
 from feincms.module.page.models import Page
 
 from filer.models import File, Image
 
 
 PageMediaFileContent = Page.content_type_for(MediaFileContent)
-PageFileContent = Page.content_type_for(FileContent)
-PageImageContent = Page.content_type_for(ImageContent)
+PageFilerFileContent = Page.content_type_for(FilerFileContent)
+PageFilerImageContent = Page.content_type_for(FilerImageContent)
 
 
-assert (PageMediaFileContent and PageFileContent and PageImageContent),\
-    'Not all required models available'
+assert all((
+    PageMediaFileContent,
+    PageFilerFileContent,
+    PageFilerImageContent)), 'Not all required models available'
 
 
 class Command(NoArgsCommand):
@@ -30,7 +34,7 @@ def handle_noargs(self, **options):
 
         for i, mediafile in enumerate(MediaFile.objects.order_by('pk')):
             model = Image if mediafile.type == 'image' else File
-            content_model = PageImageContent if mediafile.type == 'image' else PageFileContent  # noqa
+            content_model = PageFilerImageContent if mediafile.type == 'image' else PageFilerFileContent  # noqa
 
             filerfile = model.objects.create(
                 owner=user,
