Merge 283356b into 58265bd

aldryn_gallery/migrations/0003_auto_20160821_0029.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aldryn_gallery', '0002_galleryplugin_extra_styles'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='galleryplugin',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(parent_link=True, related_name='+', primary_key=True, serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='slidefolderplugin',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(parent_link=True, related_name='+', primary_key=True, serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='slideplugin',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(parent_link=True, related_name='+', primary_key=True, serialize=False, to='cms.CMSPlugin'),
+        ),
+    ]

aldryn_gallery/models.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from functools import partial
+
 from django.db import models
 from django.utils.html import strip_tags
 from django.utils.translation import ugettext_lazy as _
@@ -13,6 +15,14 @@
 from .utils import get_additional_styles
 
 
+CMSPluginField = partial(
+    models.OneToOneField,
+    to=CMSPlugin,
+    related_name='+',
+    parent_link=True,
+)
+
+
 class GalleryPlugin(CMSPlugin):
     STANDARD = 'standard'
 
@@ -25,6 +35,7 @@ class GalleryPlugin(CMSPlugin):
         ('slide', _('Slide'))
     )
 
+    cmsplugin_ptr = CMSPluginField()
     style = models.CharField(
         _('Style'), choices=STYLE_CHOICES + get_additional_styles(), default=STANDARD, max_length=50)
     extra_styles = models.CharField(
@@ -55,6 +66,7 @@ class SlidePlugin(CMSPlugin):
         ('_top', _('topmost frame')),
     )
 
+    cmsplugin_ptr = CMSPluginField()
     image = FilerImageField(verbose_name=_('image'), blank=True, null=True)
     content = HTMLField("Content", blank=True, null=True)
     url = models.URLField(_("Link"), blank=True, null=True)
@@ -98,6 +110,10 @@ def __unicode__(self):
         else:
             return image_text or content_text
 
+    def copy_relations(self, oldinstance):
+        self.image_id = oldinstance.image_id
+        self.page_link_id = oldinstance.page_link_id
+
     def get_link(self):
         link = self.url or u''
 
@@ -110,4 +126,8 @@ def get_link(self):
 
 
 class SlideFolderPlugin(CMSPlugin):
+    cmsplugin_ptr = CMSPluginField()
     folder = FilerFolderField(verbose_name=_('folder'))
+
+    def copy_relations(self, oldinstance):
+        self.folder_id = oldinstance.folder_id