Merge pull request #1488 from rdmorganiser/2.4.0-fix-multisite-not-all-sites

2.4.0 fix multisite not all sites

Author: MyPyDavid

rdmo/core/managers.py

@@ -7,7 +7,10 @@
 class CurrentSiteQuerySetMixin:
 
     def filter_current_site(self):
-        return self.filter(models.Q(sites=None) | models.Q(sites=settings.SITE_ID))
+        if settings.MULTISITE:
+            return self.filter(sites=settings.SITE_ID)
+        else:
+            return self.filter(models.Q(sites=None) | models.Q(sites=settings.SITE_ID))
 
 
 class GroupsQuerySetMixin:
@@ -20,10 +23,7 @@ def filter_group(self, user):
 class AvailabilityQuerySetMixin:
 
     def filter_availability(self, user):
-        model = str(self.model._meta)
-        permissions = PERMISSIONS[model]
-
-        if user.has_perms(permissions):
+        if user.has_perms(PERMISSIONS[self.model._meta.label_lower]):
             return self
         else:
             return self.filter(available=True)

rdmo/management/managers.py

@@ -4,6 +4,7 @@
 from django.db.models import ForeignKey, ManyToManyField, Model
 
 from rdmo.projects.models import Project
+from rdmo.projects.utils import filter_tasks_or_views_for_project
 from rdmo.tasks.models import Task
 from rdmo.views.models import View
 
@@ -46,11 +47,11 @@ def sync_task_or_view_to_projects(instance):
         instance.projects.add(*to_add)
 
 
-def sync_tasks_or_views_on_a_project(project, model):
+def sync_tasks_or_views_on_a_project(project, task_or_view):
     """Ensure the project is linked to exactly the correct instances of a model (View/Task)."""
-    project_m2m_field = get_related_field_name_on_model_for_instance(Project, model)
+    project_m2m_field = get_related_field_name_on_model_for_instance(Project, task_or_view)
 
-    desired_instances = model.objects.filter_for_project(project)
+    desired_instances = filter_tasks_or_views_for_project(task_or_view, project)
     current_instances = getattr(project, project_m2m_field).all()
 
     to_remove = current_instances.exclude(pk__in=desired_instances)

rdmo/projects/handlers/sync_utils.py

@@ -106,10 +106,7 @@ def process(self):
         if self.current_project is None:
             catalog_uri = get_uri(self.root.find('catalog'), self.ns_map)
 
-            available_catalogs = Catalog.objects.filter_current_site() \
-                                                .filter_group(self.request.user) \
-                                                .filter_availability(self.request.user) \
-                                                .order_by('order')
+            available_catalogs = Catalog.objects.filter_for_user(self.request.user)
 
             try:
                 self.catalog = available_catalogs.get(uri=catalog_uri)

rdmo/projects/imports.py

@@ -72,22 +72,25 @@ def filter_groups(self, groups):
         return self.filter(memberships__in=memberships).distinct()
 
     def filter_projects_for_task_or_view(self, instance):
-        # if View/Task is not available it should not show for any project
-        if not instance.available:
-            return self.none()
-
         # projects that have an unavailable catalog should be disregarded
         qs = self.filter(catalog__available=True)
 
-        # when instance.catalogs is empty it applies to all
+        # when View/Task is not available it should not show for any project
+        if not instance.available:
+            return self.none()
+
+        # when View/Task has any catalogs it can be filtered for those
         if instance.catalogs.exists():
             qs = qs.filter(catalog__in=instance.catalogs.all())
 
-        # when instance.sites is empty it applies to all
+        # when View/Task has any sites it can be filtered for those
         if instance.sites.exists():
             qs = qs.filter(site__in=instance.sites.all())
+        elif settings.MULTISITE:
+            # when View/Task has no sites in a multi-site, it should not appear at all
+            return self.none()
 
-        # when instance.groups is empty it applies to all
+        # when  has any groups it can be filtered for those
         if instance.groups.exists():
             qs = qs.filter_groups(instance.groups.all())
 

rdmo/projects/managers.py

@@ -53,10 +53,7 @@ class ProjectSerializer(serializers.ModelSerializer):
     class CatalogField(serializers.PrimaryKeyRelatedField):
 
         def get_queryset(self):
-            return Catalog.objects.filter_current_site() \
-                                  .filter_group(self.context['request'].user) \
-                                  .filter_availability(self.context['request'].user) \
-                                  .order_by('-available', 'order')
+            return Catalog.objects.filter_for_user(self.context['request'].user)
 
     class ParentField(serializers.PrimaryKeyRelatedField):
 

rdmo/projects/serializers/v1/__init__.py

@@ -2,6 +2,13 @@
 
 from django.apps import apps
 
+from .helpers.project_catalog import clear_sites_from_other_catalogs  # noqa: F401
+
+
+@pytest.fixture
+def enable_multisite(settings):
+    assert not settings.MULTISITE  # assert that the default is False first
+    settings.MULTISITE = True
 
 @pytest.fixture
 def enable_project_views_sync(settings):

rdmo/projects/tests/conftest.py

@@ -0,0 +1,15 @@
+import pytest
+
+from rdmo.questions.models import Catalog
+
+
+@pytest.fixture
+def clear_sites_from_other_catalogs(settings):
+    # arrange, remove sites from the other catalogs
+    # for 'list': 'v1-projects:catalog-list'
+    # in non-multisite, they should appear
+    # however, in a multisite they should not appear
+    other_catalogs = Catalog.objects.exclude(sites=settings.SITE_ID)
+    assert set(other_catalogs.values_list('id',flat=True)) == {3,4}
+    for catalog in other_catalogs:
+        catalog.sites.clear()