Merge pull request #3785 from peterfarrell/issue_3782

Fixes Issue #3782

cms/cms_plugins.py

@@ -5,7 +5,6 @@
 from cms.plugin_base import CMSPluginBase, PluginMenuItem
 from cms.plugin_pool import plugin_pool
 from cms.plugin_rendering import render_placeholder
-from cms.utils.plugins import downcast_plugins, build_plugin_tree
 from cms.utils.urlutils import admin_reverse
 from django.conf.urls import url
 from django.http import HttpResponseForbidden, HttpResponseBadRequest, HttpResponse
@@ -34,6 +33,7 @@ class AliasPlugin(CMSPluginBase):
     render_template = "cms/plugins/alias.html"
 
     def render(self, context, instance, placeholder):
+        from cms.utils.plugins import downcast_plugins, build_plugin_tree
         context['instance'] = instance
         context['placeholder'] = placeholder
         if instance.plugin_id:

cms/migrations/0008_auto_20150121_0059.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0007_auto_20141028_1559'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='page',
+            unique_together=set([('reverse_id', 'site', 'publisher_is_draft'), ('publisher_is_draft', 'site', 'application_namespace')]),
+        ),
+    ]

cms/migrations/0009_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0008_auto_20150121_0059'),
+        ('cms', '0008_auto_20150208_2149'),
+    ]
+
+    operations = [
+    ]

cms/models/pagemodel.py

@@ -121,7 +121,7 @@ class Meta:
             ('publish_page', 'Can publish page'),
             ('edit_static_placeholder', 'Can edit static placeholders'),
         )
-        unique_together = (("publisher_is_draft", "application_namespace"),
+        unique_together = (("publisher_is_draft", "site", "application_namespace"),
                            ("reverse_id", "site", "publisher_is_draft"))
         verbose_name = _('page')
         verbose_name_plural = _('pages')