Merge pull request #5510 from yakky/feature/apphook_config_multisite_32

Removed globally unique constraint for Apphook configs
django-cms · Jul 6, 2016 · 7326645 · 7326645
2 parents 78a08f2 + 692e783
commit 7326645
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -6,6 +6,7 @@
 - Deprecates the old-style wizard-related settings
 - CMS handles uninstalled apphooks better
 - Fix toolbar placement when foundation is installed
+- Removed globally unique constraint for Apphook configs.
 
 === 3.2.5 (2016-04-27) ===
 

diff --git a/cms/admin/forms.py b/cms/admin/forms.py
@@ -288,6 +288,7 @@ def __init__(self, *args, **kwargs):
     def _check_unique_namespace_instance(self, namespace):
         return Page.objects.filter(
             publisher_is_draft=True,
+            site_id=self.instance.site_id,
             application_namespace=namespace
         ).exclude(pk=self.instance.pk).exists()