diff --git a/src/api/serializers.py b/src/api/serializers.py index bbad60a25ca8a057c2da409cb7360f97f328f9af..e8ff4d0190d7198b13583b122b5844f822897954 100644 --- a/src/api/serializers.py +++ b/src/api/serializers.py @@ -228,7 +228,7 @@ class BadgeSerializer(HubModelSerializer): ) def create(self, validated_data): - issuing_assembly = Assembly.objects.filter(slug=self.context['assembly']) + issuing_assembly = Assembly.objects.filter(slug__iexact=self.context['assembly']) conference = Conference.objects.filter(slug=self.context['conference']) validated_data.update({'conference': conference, 'issuing_assembly': issuing_assembly}) return super().create(validated_data) diff --git a/src/api/views/badges.py b/src/api/views/badges.py index 5d6a7d49183cb8797778c28900083e1274011fe3..a9d9789ac1f67e03a80319b836dcc9016061c83a 100644 --- a/src/api/views/badges.py +++ b/src/api/views/badges.py @@ -26,7 +26,7 @@ class BadgeListCreate(ListCreateAPIView): def get_queryset(self): queryset = self.model.objects.all() assembly = self.kwargs.get('assembly') - return queryset.filter(issuing_assembly__slug=assembly) + return queryset.filter(issuing_assembly__slug__iexact=assembly) def get_serializer_context(self): context = super().get_serializer_context() @@ -43,7 +43,7 @@ class BadgeTokenListCreate(ConferenceSlugAssemblyMixin, ListCreateAPIView): queryset = BadgeToken.objects.all() assembly = self.kwargs.get('assembly') badge = self.kwargs.get('pk') - return queryset.filter(badge=badge, badge__issuing_assembly__slug=assembly) + return queryset.filter(badge=badge, badge__issuing_assembly__slug__iexact=assembly) def get_serializer_context(self): if self.kwargs.get('pk'): diff --git a/src/api/views/mixins.py b/src/api/views/mixins.py index 46c9302450d1ce62942b9217e02672d560521884..8ba7e8deee90aa90a71ef6cd99a63ae642101452 100644 --- a/src/api/views/mixins.py +++ b/src/api/views/mixins.py @@ -54,7 +54,7 @@ class ConferenceSlugAssemblyMixin(ConferenceSlugMixin): if self._assembly is None: assembly_slug = self.request.resolver_match.kwargs['assembly'] try: - self._assembly = Assembly.objects.associated_with_user(self.conference, user=self.request.user).get(slug=assembly_slug) + self._assembly = Assembly.objects.associated_with_user(self.conference, user=self.request.user).get(slug__iexact=assembly_slug) except Assembly.DoesNotExist: if issuing_token := self.kwargs.get('issuing_token', None): try: diff --git a/src/backoffice/forms/__init__.py b/src/backoffice/forms/__init__.py index 9753d9d085e692bc68d58e09628f97a659d1d52c..23cf9d09ce338f9e7590698dd4bc2d808366bdae 100644 --- a/src/backoffice/forms/__init__.py +++ b/src/backoffice/forms/__init__.py @@ -86,13 +86,13 @@ class ScheduleSourceCreateForm(forms.ModelForm): assembly_slug = self.cleaned_data['assembly_slug'] if assembly_slug == '*': return None - if not Assembly.objects.filter(conference=self._conference, slug=assembly_slug).exists(): + if not Assembly.objects.filter(conference=self._conference, slug__iexact=assembly_slug).exists(): raise ValidationError('An assembly with this slug does not exist.') return assembly_slug def clean(self): assembly_slug = self.cleaned_data.get('assembly_slug') - self.instance.assembly = Assembly.objects.get(conference=self._conference, slug=assembly_slug) if assembly_slug else None + self.instance.assembly = Assembly.objects.get(conference=self._conference, slug__iexact=assembly_slug) if assembly_slug else None self.instance.conference = self._conference try: self.instance.import_frequency = str2timedelta(self.cleaned_data.get('import_frequency')) diff --git a/src/backoffice/forms/assemblies.py b/src/backoffice/forms/assemblies.py index cb3d92f4d1f84daee102ded38c97a174cef9806a..3cc02fda6f427db7820aae32ef93ba23aa6140ae 100644 --- a/src/backoffice/forms/assemblies.py +++ b/src/backoffice/forms/assemblies.py @@ -36,7 +36,7 @@ class AssemblyCreateForm(forms.ModelForm): if self._conference.has_disclaimer('assembly') and not self.cleaned_data['disclaimer']: self.add_error('disclaimer', _('Assembly__disclaimer-needed')) - if (slug := self.cleaned_data.get('slug')) and Assembly.objects.filter(conference=self._conference, slug=slug).exists(): + if (slug := self.cleaned_data.get('slug')) and Assembly.objects.filter(conference=self._conference, slug__iexact=slug).exists(): self.add_error('slug', _('Assembly__slug__already_exists')) # ensure Assembly's conference is set before saving @@ -106,7 +106,7 @@ class AssemblyEditForm(TranslatedFieldsForm): # slug must not already exist in the conference slug = self.cleaned_data.get('slug') - if slug is not None and Assembly.objects.filter(conference=self.instance.conference, slug=slug).exclude(pk=self.instance.pk).exists(): + if slug is not None and Assembly.objects.filter(conference=self.instance.conference, slug__iexact=slug).exclude(pk=self.instance.pk).exists(): self.add_error('slug', _('Assembly__slug__already_exists')) diff --git a/src/backoffice/views/moderation/mixins.py b/src/backoffice/views/moderation/mixins.py index d912468bfd569cf430bf15ab8ecb978b7c6c1b48..b4f75e7ebdf8ab577d78a165483baa49473a38bb 100644 --- a/src/backoffice/views/moderation/mixins.py +++ b/src/backoffice/views/moderation/mixins.py @@ -39,7 +39,7 @@ def lookup_moderation_items(conference: Conference, query: str): candidates.append(('assembly', p.kwargs['pk'])) for kw in ['slug', 'assembly_slug']: if kw in p.kwargs: - for a in conference.assemblies.filter(slug=p.kwargs[kw]).values('pk'): + for a in conference.assemblies.filter(slug__iexact=p.kwargs[kw]).values('pk'): candidates.append(('assembly', a['pk'])) if '/event' in p.route: if 'pk' in p.kwargs: diff --git a/src/plainui/urls.py b/src/plainui/urls.py index f50098409045120b3dff51b5f80c40c6bfadaad7..c6ac7b5d65f7c09d5ed3c91d3cc86511ca4c4d07 100644 --- a/src/plainui/urls.py +++ b/src/plainui/urls.py @@ -89,7 +89,6 @@ urlpatterns = [ re_path(r'^assemblies/(?P<page>[0a-z])', views.AssembliesView.as_view(), name='assemblies_paginated'), re_path(r'^assemblies/all/(?P<page>[0a-z])', views.AssembliesAllView.as_view(), name='assemblies_all_paginated'), path('assembly/<slug:assembly_slug>/', views.AssemblyView.as_view(), name='assembly'), - path('assembly/<slug:slug>/', views.AssemblyView.as_view(), name='assembly'), path('sos/', views.SosList.as_view(), name='sos'), path('so/project/<slug:slug>/', views.ProjectView.as_view(self_organized=True), name='so_project'), path('report', views.ReportContentView.as_view(), name='report_content'), diff --git a/src/plainui/views/assemblies.py b/src/plainui/views/assemblies.py index c6a27a38df96cf4c3590b1087aa8a51cbbe94f7e..0197ef7e857078dd848e960d9d00fe82f75cd9a3 100644 --- a/src/plainui/views/assemblies.py +++ b/src/plainui/views/assemblies.py @@ -36,11 +36,8 @@ logger = logging.getLogger(__name__) class AssemblyView(ConferenceRequiredMixin, DetailView): model = Assembly template_name = 'plainui/assembly.html.j2' - - def dispatch(self, request, *args, assembly_slug: str | None = None, **kwargs): - if assembly_slug: - self.kwargs.update({'slug': self.kwargs.pop('assembly_slug')}) - return super().dispatch(request, *args, **kwargs) + slug_url_kwarg = 'assembly_slug' + slug_field = 'slug__iexact' def get_queryset(self) -> QuerySet[Any]: return Assembly.objects.conference_accessible(self.conf).prefetch_related(