2.4.0 fix multisite not all sites by MyPyDavid · Pull Request #1488 · rdmorganiser/rdmo

MyPyDavid · 2025-11-20T21:03:40Z

Description

Related issue: #1481

Motivation and Context

How has this been tested?

Screenshots (if appropriate)

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

jochenklar

Awesome! Some mostly cosmetic remarks.

rdmo/projects/tests/conftest.py

rdmo/questions/migrations/0098_data_migration_for_multisite.py

rdmo/questions/managers.py

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

MyPyDavid · 2025-11-27T11:34:44Z

Wait, maybe I need to change this behaviour in the Task and View managers as well.
For some reason I added the CurrentSiteQuerySetMixin to the TaskQuerySet but it does not even use the filter_current_site but instead a filter_for_project_site because I wanted to filter for the site that the projects has.
I think that I should refactor that filter_for_project_site or filter_for_site into core/managers and add this new multisite behaviour (and do the same for the View and add some tests as well).
What do you think @jochenklar?

rdmo/rdmo/tasks/managers.py

Line 13 in 02755ca

class TaskQuerySet(CurrentSiteQuerySetMixin, GroupsQuerySetMixin, AvailabilityQuerySetMixin, QuerySet):

Like so: #1436 (comment)

jochenklar · 2025-11-27T12:34:03Z

I am not sure, I think projects already always have a site they belong to, right? If I remember correctly, it was important that for Issues and Views the site of the project is checked and not the site of the user.

MyPyDavid · 2025-11-27T13:43:34Z

I am not sure, I think projects already always have a site they belong to, right? If I remember correctly, it was important that for Issues and Views the site of the project is checked and not the site of the user.

yes, I mean to add this new if settings.MULTISITE ... behaviour(not all when None) also to the queries on Task.sites and View.sites , and then it will indeed use the project.site as argument.

rdmo/rdmo/tasks/managers.py

Line 19 in 02755ca

return self.filter(Q(sites=None) | Q(sites=site))

jochenklar · 2025-11-27T14:13:40Z

Ah, yes, makes sense.

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

MyPyDavid · 2025-11-27T15:30:28Z

still need to add tests for the new multisite filter behaviour

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

MyPyDavid · 2025-11-28T08:32:47Z

rdmo/management/managers.py

+)
+
+
+class ForProjectQuerySet(ForSiteQuerySetMixin, ForGroupsQuerySetMixin, ForCatalogQuerySetMixin,


What do you think about this @jochenklar??
It cleans up a lot of code and is currently only used by Views and Tasks..

On second thought, I would keep the View and Task QuerySet classes and just add a mixin to it (not remove them completely)..

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

jochenklar · 2025-12-01T10:47:34Z

In principle its fine, but ...

The tasks and views django apps, should not be dependent on on management (its the other way around).
This is one layer of indirection to much for me. The ForSiteQuerySetMixin, ForGroupsQuerySetMixin, ForCatalogQuerySetMixin are not needed.

I would:

move the ForProjectManagerMixin to core and call it MultisiteManagerMixin or ProjectManagerMixin.

Alternatively (and after giving it some more thought): maybe this is not a good case for managers. After all those are project related functions and should be part of the projects django app. Why not create a filter_for_project(model, project) method in project.utils containing all the code and be done with it. Also easy testable.

jochenklar · 2025-12-01T10:49:32Z

Maybe filter_elements_for_project(Task, project)?

MyPyDavid · 2025-12-01T15:04:56Z

Maybe filter_elements_for_project(Task, project)?

Are Task and View also considered as normal elements? ;)

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

…_project function Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

MyPyDavid · 2025-12-01T20:06:54Z

rdmo/core/managers.py


    def filter_current_site(self):
-        return self.filter(models.Q(sites=None) | models.Q(sites=settings.SITE_ID))
+        if settings.MULTISITE:


this is the fix for the issue #1481

MyPyDavid · 2025-12-01T20:09:14Z

rdmo/projects/utils.py

              cc=[request.user.email], reply_to=[request.user.email])
+
+
+def filter_tasks_or_views_for_project(task_or_view, project) -> TaskQuerySet | ViewQuerySet:


this is the new util function,
it has the nice return type annotation 👀

MyPyDavid · 2025-12-04T13:27:52Z

rdmo/views/managers.py

    def get_queryset(self) -> ViewQuerySet:
        return ViewQuerySet(self.model, using=self._db)

-    def filter_catalog(self, catalog):


I don't think this was used anywhere even before this PR..

jochenklar

🕺

MyPyDavid added 4 commits November 20, 2025 21:41

Do not filter no sites for multisite #1481

9cdc2a2

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Simplifiy availability filter

c17a1e1

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Add catalog filter for user and refactor

8858756

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Add data migration for catalog.sites in multisite

6fbe9de

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

MyPyDavid linked an issue Nov 20, 2025 that may be closed by this pull request

[multisite] A catalog can be made available to other sites when removing all of the sites from the catalog #1481

Closed

MyPyDavid self-assigned this Nov 21, 2025

MyPyDavid added the status:work-in-progress label Nov 21, 2025

MyPyDavid added this to the RDMO 2.4.0 milestone Nov 21, 2025

MyPyDavid added 6 commits November 21, 2025 14:53

Add a CatalogQueryset method for projects

8427adc

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Revert to correct user object in serializer

ccc0e0c

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

projects(tests): move enable multisite fixture

a851204

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

projects(tests): update viewset catalog

ec58221

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Add projects catalog tests for #1481

de9b360

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Also order filtered catalogs by id

f79a7f1

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

MyPyDavid removed the status:work-in-progress label Nov 24, 2025

MyPyDavid requested a review from jochenklar November 24, 2025 13:09

jochenklar requested changes Nov 25, 2025

View reviewed changes

MyPyDavid added 2 commits November 27, 2025 11:27

Do not use list in Catalogs data migration

dd38f6d

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Update Catalog manager methods and use subquery in viewset

02755ca

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

MyPyDavid mentioned this pull request Nov 27, 2025

Draft: add rdmo.config app for Plugin model (plugin management) #1436

Open

Refactor QuerysetMixins for Task and View

5b33ed7

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Refactor View and Task managers into ForProjectManager

ff8ff63

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

MyPyDavid commented Nov 28, 2025

View reviewed changes

Add multisite condition for sites to task or view filter for projects

cd37b53

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

MyPyDavid added 3 commits December 1, 2025 16:17

Update and fix project sync tests

98d5c1e

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Add query for catalogs to filter_projects_for_task_or_view

f197bfb

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Refactor manager methods into projects.util filter_tasks_or_views_for…

d1e4e3c

…_project function Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

MyPyDavid commented Dec 1, 2025

View reviewed changes

MyPyDavid requested a review from jochenklar December 1, 2025 20:30

MyPyDavid commented Dec 4, 2025

View reviewed changes

jochenklar approved these changes Dec 4, 2025

View reviewed changes

MyPyDavid merged commit 2969be0 into 2.4.0 Dec 4, 2025
18 checks passed

MyPyDavid deleted the 2.4.0-fix-multisite-not-all-sites branch December 4, 2025 15:30

MyPyDavid added type:bug type:maintenance labels Dec 4, 2025

MyPyDavid mentioned this pull request Dec 5, 2025

Update CHANGELOG.md #1482

Merged

		)


		class ForProjectQuerySet(ForSiteQuerySetMixin, ForGroupsQuerySetMixin, ForCatalogQuerySetMixin,

		cc=[request.user.email], reply_to=[request.user.email])


		def filter_tasks_or_views_for_project(task_or_view, project) -> TaskQuerySet \| ViewQuerySet:

Conversation

MyPyDavid commented Nov 20, 2025

Description

Motivation and Context

How has this been tested?

Screenshots (if appropriate)

Uh oh!

jochenklar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MyPyDavid commented Nov 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jochenklar commented Nov 27, 2025

Uh oh!

MyPyDavid commented Nov 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jochenklar commented Nov 27, 2025

Uh oh!

MyPyDavid commented Nov 27, 2025

Uh oh!

MyPyDavid Nov 28, 2025

Choose a reason for hiding this comment

Uh oh!

MyPyDavid Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jochenklar commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jochenklar commented Dec 1, 2025

Uh oh!

MyPyDavid commented Dec 1, 2025

Uh oh!

MyPyDavid Dec 1, 2025

Choose a reason for hiding this comment

Uh oh!

MyPyDavid Dec 1, 2025

Choose a reason for hiding this comment

Uh oh!

MyPyDavid Dec 4, 2025

Choose a reason for hiding this comment

Uh oh!

jochenklar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MyPyDavid commented Nov 27, 2025 •

edited

Loading

MyPyDavid commented Nov 27, 2025 •

edited

Loading

MyPyDavid Dec 1, 2025 •

edited

Loading

jochenklar commented Dec 1, 2025 •

edited

Loading