Merge d56aba6 into 7077b7c

cms/models/aliaspluginmodel.py

@@ -7,6 +7,7 @@
 
 @python_2_unicode_compatible
 class AliasPluginModel(CMSPlugin):
+    cmsplugin_ptr = models.OneToOneField(CMSPlugin, related_name='cms_aliasplugin', parent_link=True)
     plugin = models.ForeignKey(CMSPlugin, editable=False, related_name="alias_reference", null=True)
     alias_placeholder = models.ForeignKey(Placeholder, editable=False, related_name="alias_placeholder", null=True)
 

cms/models/managers.py

@@ -75,10 +75,7 @@ def search(self, q, language=None, current_site_only=True):
                 continue
             field = cmsplugin.cmsplugin_ptr.field
             related_query_name = field.related_query_name()
-            if (
-                related_query_name and
-                related_query_name != '+'
-            ):
+            if related_query_name and not related_query_name.startswith('+'):
                 for field in cmsplugin.search_fields:
                     qp |= Q(**{
                         'placeholders__cmsplugin__{0}__{1}__icontains'.format(

cms/models/placeholderpluginmodel.py

@@ -8,9 +8,9 @@
 
 @python_2_unicode_compatible
 class PlaceholderReference(CMSPlugin):
+    cmsplugin_ptr = models.OneToOneField(CMSPlugin, related_name='cms_placeholderreference', parent_link=True)
     name = models.CharField(max_length=255)
     placeholder_ref = PlaceholderField(slotname='clipboard')
-
     class Meta:
         app_label = 'cms'
 

cms/models/pluginmodel.py

@@ -48,6 +48,20 @@ def __new__(cls, name, bases, attrs):
         # create a new class (using the super-metaclass)
         new_class = super(PluginModelBase, cls).__new__(cls, name, bases, attrs)
 
+        # Set the one-to-one parent-child field to not create the reverse
+        # related descriptor to avoid name clashes for plugins with the same
+        # fieldnames. Skip this check if the parent-child field has been
+        # explicitly defined in the plugin subclass
+        #
+        # NOTE: We only do concrete classes, skipping the abstract ones
+        if 'cmsplugin_ptr' not in attrs and not new_class._meta.abstract:
+            for field in new_class._meta.fields:
+                if field.name == 'cmsplugin_ptr':
+                    app_label = new_class._meta.app_label
+                    model_name = new_class._meta.concrete_model._meta.model_name
+                    field.rel.related_name = '{0}_{1}'.format(
+                        app_label, model_name)
+
         # if there is a RenderMeta in attrs, use this one
         # else try to use the one from the superclass (if present)
         meta = attr_meta or getattr(new_class, '_render_meta', None)