]> git.parisson.com Git - teleforma.git/commitdiff
Disable filtered queryset on suggested conference / seminar : https://trackers.pilots...
authorYoan Le Clanche <yoanl@pilotsystems.net>
Thu, 23 Sep 2021 08:56:28 +0000 (10:56 +0200)
committerYoan Le Clanche <yoanl@pilotsystems.net>
Thu, 23 Sep 2021 08:56:28 +0000 (10:56 +0200)
teleforma/admin.py

index 8b3b016161e125f734a0dbf5b5b3566e2cef8378..acbc97c8583b0ac32cedb5e9bab3cbde106024c8 100644 (file)
@@ -167,18 +167,18 @@ class ConferenceAdmin(admin.ModelAdmin):
             Q(period__name__in=years) | 
             Q(id__in=current_values)
         )
-        if instance:
-            current_values = [doc.id for doc in instance.suggested_seminars.all()]
-        context['adminform'].form.fields['suggested_seminars'].queryset = Seminar.objects.filter(
-            Q(private=2) | 
-            Q(id__in=current_values)
-        )
-        if instance:
-            current_values = [doc.id for doc in instance.suggested_conferences.all()]
-        context['adminform'].form.fields['suggested_conferences'].queryset = Conference.objects.filter(
-            Q(status=2) | 
-            Q(id__in=current_values)
-        )
+        if instance:
+            current_values = [doc.id for doc in instance.suggested_seminars.all()]
+        context['adminform'].form.fields['suggested_seminars'].queryset = Seminar.objects.filter(
+            Q(private=2) | 
+            Q(id__in=current_values)
+        )
+        if instance:
+            current_values = [doc.id for doc in instance.suggested_conferences.all()]
+        context['adminform'].form.fields['suggested_conferences'].queryset = Conference.objects.filter(
+            Q(status=2) | 
+            Q(id__in=current_values)
+        )
         return super(ConferenceAdmin, self).render_change_form(request, context, *args, **kwargs)
 
     def export_conference(self, request, queryset):
@@ -257,18 +257,18 @@ class SeminarAdmin(admin.ModelAdmin):
         )
         
         # Suggested seminars / conferences
-        if instance:
-            current_values = [doc.id for doc in instance.suggested_seminars.all()]
-        context['adminform'].form.fields['suggested_seminars'].queryset = Seminar.objects.filter(
-            Q(private=2) | 
-            Q(id__in=current_values)
-        )
-        if instance:
-            current_values = [doc.id for doc in instance.suggested_conferences.all()]
-        context['adminform'].form.fields['suggested_conferences'].queryset = Conference.objects.filter(
-            Q(status=2) | 
-            Q(id__in=current_values)
-        )
+        if instance:
+            current_values = [doc.id for doc in instance.suggested_seminars.all()]
+        context['adminform'].form.fields['suggested_seminars'].queryset = Seminar.objects.filter(
+            Q(private=2) | 
+            Q(id__in=current_values)
+        )
+        if instance:
+            current_values = [doc.id for doc in instance.suggested_conferences.all()]
+        context['adminform'].form.fields['suggested_conferences'].queryset = Conference.objects.filter(
+            Q(status=2) | 
+            Q(id__in=current_values)
+        )
         return super(SeminarAdmin, self).render_change_form(request, context, *args, **kwargs)
 
     def clone_seminars(self, request, queryset):