added changes

Author: FinalAngel

CHANGELOG.rst

@@ -6,7 +6,10 @@ Changelog
 2.0.0 (unreleased)
 ==================
 
-* ...
+* Added tests
+* Cleaned up file structure
+* Removed Django < 1.8 support
+* Adapted ``README.txt``
 
 
 1.0.0 (2016-03-04)

djangocms_file/migrations/0002_auto_20151202_1551.py

@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='file',
             name='target',
-            field=models.CharField(default=b'', choices=[(b'', 'same window'), (b'_blank', 'new window'), (b'_parent', 'parent window'), (b'_top', 'topmost frame')], max_length=100, blank=True, help_text='Optional link target.', verbose_name='target'),
+            field=models.CharField(default='', choices=[('', 'same window'), ('_blank', 'new window'), ('_parent', 'parent window'), ('_top', 'topmost frame')], max_length=100, blank=True, help_text='Optional link target.', verbose_name='target'),
             preserve_default=True,
         ),
         migrations.AlterField(

djangocms_file/migrations/0007_adapted_fields.py

@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='file',
             name='template',
-            field=models.CharField(default=b'default', max_length=255, verbose_name='Template', choices=[(b'default', 'Default')]),
+            field=models.CharField(default='default', max_length=255, verbose_name='Template', choices=[('default', 'Default')]),
         ),
         migrations.RenameField(
             model_name='file',

djangocms_file/migrations/0008_add_folder.py

@@ -19,8 +19,8 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Folder',
             fields=[
-                ('template', models.CharField(default=b'default', max_length=255, verbose_name='Template', choices=[(b'default', 'Default')])),
-                ('link_target', models.CharField(default=b'', max_length=255, verbose_name='Link target', blank=True, choices=[(b'_self', 'Open in same window.'), (b'_blank', 'Open in new window.'), (b'_parent', 'Delegate to parent.'), (b'_top', 'Delegate to top.')])),
+                ('template', models.CharField(default='default', max_length=255, verbose_name='Template', choices=[('default', 'Default')])),
+                ('link_target', models.CharField(default='', max_length=255, verbose_name='Link target', blank=True, choices=[('_self', 'Open in same window.'), ('_blank', 'Open in new window.'), ('_parent', 'Delegate to parent.'), ('_top', 'Delegate to top.')])),
                 ('show_file_size', models.BooleanField(default=False, help_text='Appends the file size at the end of the name.', verbose_name='Show file size')),
                 ('attributes', djangocms_attributes_field.fields.AttributesField(default=dict, verbose_name='Attributes', blank=True)),
                 ('cmsplugin_ptr', models.OneToOneField(parent_link=True, related_name='djangocms_file_folder', primary_key=True, serialize=False, to='cms.CMSPlugin')),

djangocms_file/models.py

@@ -40,6 +40,7 @@ class File(CMSPlugin):
     Renders a file wrapped by an anchor
     """
     search_fields = ('name',)
+
     TEMPLATE_CHOICES = [
         ('default', _('Default')),
     ]
@@ -84,7 +85,7 @@ class File(CMSPlugin):
     attributes = AttributesField(
         verbose_name=_('Attributes'),
         blank=True,
-        excluded_keys=['title', 'target'],
+        excluded_keys=['href', 'title', 'target'],
     )
 
     # Add an app namespace to related_name to avoid field name clashes
@@ -98,10 +99,20 @@ class File(CMSPlugin):
     )
 
     def __str__(self):
+        if self.file_src and self.file_src.label:
+            return self.file_src.label
+        return str(self.pk)
+
+    def get_short_description(self):
         if self.file_src and self.file_src.label:
             return self.file_src.label
         return ugettext('<file is missing>')
 
+    def copy_relations(self, oldinstance):
+        # Because we have a ForeignKey, it's required to copy over
+        # the reference from the instance to the new plugin.
+        self.file_src = oldinstance.file_src
+
 
 @python_2_unicode_compatible
 class Folder(CMSPlugin):
@@ -141,7 +152,7 @@ class Folder(CMSPlugin):
     attributes = AttributesField(
         verbose_name=_('Attributes'),
         blank=True,
-        excluded_keys=['target'],
+        excluded_keys=['href', 'target'],
     )
 
     # Add an app namespace to related_name to avoid field name clashes
@@ -155,10 +166,20 @@ class Folder(CMSPlugin):
     )
 
     def __str__(self):
+        if self.folder_src and self.folder_src.name:
+            return self.folder_src.name
+        return str(self.pk)
+
+    def get_short_description(self):
         if self.folder_src and self.folder_src.name:
             return self.folder_src.name
         return ugettext('<folder is missing>')
 
+    def copy_relations(self, oldinstance):
+        # Because we have a ForeignKey, it's required to copy over
+        # the reference from the instance to the new plugin.
+        self.folder_src = oldinstance.folder_src
+
     def get_files(self):
         folder_files = []
 

djangocms_file/templates/djangocms_file/default/file.html

@@ -5,10 +5,10 @@
     {% if instance.file_name %}
         {{ instance.file_name }}
     {% else %}
-        {{ instance.file_src.name }}
+        {{ instance.file_src.label }}
     {% endif %}
     {% if instance.show_file_size %}
-        <span>{{ intsance.file_src.size|filesizeformat }}</span>
+        <span>{{ instance.file_src.size|filesizeformat }}</span>
     {% endif %}
 </a>
 

djangocms_file/templates/djangocms_file/default/folder.html

@@ -9,6 +9,7 @@
             <span>{{ file.size|filesizeformat }}</span>
         {% endif %}
     </a>
+    {% if not forloop.last %}<br>{% endif %}
 {% empty %}
     <p>{% trans "No files were found in the specified folder." %}</p>
 {% endfor %}