Skip to content

RDMO 2.3.2 🐛🐛 #1361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

RDMO 2.3.2 🐛🐛 #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c478a09
bump version to 2.3.2
MyPyDavid May 23, 2025
c21b7ba
Add a PNG version of the logo
jochenklar May 25, 2025
78f4ad5
Fix get_option in the Export base class
jochenklar May 25, 2025
4951f7b
Merge pull request #1363 from rdmorganiser/add_png_logo
jochenklar May 27, 2025
65e8f8b
style(managers): rename classes to QuerySet
MyPyDavid May 27, 2025
4c177e2
Merge pull request #1364 from rdmorganiser/fix_export
jochenklar May 27, 2025
6f8f6cc
Merge pull request #1366 from rdmorganiser/fix-naming-of-queryset-cla…
MyPyDavid May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rdmo/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.3.1"
__version__ = "2.3.2"
Binary file added rdmo/core/static/core/img/rdmo-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion rdmo/projects/exports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def get_option(self, options, path, set_prefix='', set_index=0, collection_index
value = self.get_value(path, set_prefix=set_prefix, set_index=set_index, collection_index=collection_index)
if value and value.option:
# lookup option dict in class
return options.get(value.option.path, default)
return options.get(value.option.uri_path, default)
else:
return default

Expand Down
4 changes: 2 additions & 2 deletions rdmo/questions/managers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
)


class CatalogQuestionSet(CurrentSiteQuerySetMixin, GroupsQuerySetMixin, AvailabilityQuerySetMixin, models.QuerySet):
class CatalogQuerySet(CurrentSiteQuerySetMixin, GroupsQuerySetMixin, AvailabilityQuerySetMixin, models.QuerySet):

def filter_catalog(self, catalog):
return self.filter(models.Q(catalogs=None) | models.Q(catalogs=catalog))
Expand All @@ -22,7 +22,7 @@ def prefetch_elements(self):
class CatalogManager(CurrentSiteManagerMixin, GroupsManagerMixin, AvailabilityManagerMixin, models.Manager):

def get_queryset(self):
return CatalogQuestionSet(self.model, using=self._db)
return CatalogQuerySet(self.model, using=self._db)

def filter_catalog(self, catalog):
return self.get_queryset().filter_catalog(catalog)
Expand Down
6 changes: 3 additions & 3 deletions rdmo/tasks/managers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
)


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

def filter_catalog(self, catalog):
return self.filter(Q(catalogs=None) | Q(catalogs=catalog))
Expand All @@ -23,8 +23,8 @@ def filter_for_project_group(self, project):

class TaskManager(CurrentSiteManagerMixin, GroupsManagerMixin, AvailabilityManagerMixin, Manager):

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

def filter_catalog(self, catalog):
return self.get_queryset().filter_catalog(catalog)
Expand Down
6 changes: 3 additions & 3 deletions rdmo/views/managers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
)


class ViewQuestionSet(CurrentSiteQuerySetMixin, GroupsQuerySetMixin, AvailabilityQuerySetMixin, QuerySet):
class ViewQuerySet(CurrentSiteQuerySetMixin, GroupsQuerySetMixin, AvailabilityQuerySetMixin, QuerySet):

def filter_catalog(self, catalog):
return self.filter(Q(catalogs=None) | Q(catalogs=catalog))
Expand All @@ -23,8 +23,8 @@ def filter_for_project_group(self, project):

class ViewManager(CurrentSiteManagerMixin, GroupsManagerMixin, AvailabilityManagerMixin, Manager):

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

def filter_catalog(self, catalog):
return self.get_queryset().filter_catalog(catalog)
Expand Down