Merge branch 'Hexlet:main' into edit_achievements

Hexlet · Jun 18, 2024 · df93d1a · df93d1a
2 parents be4c7d1 + 58300b2
commit df93d1a
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/contributors/views/filters.py b/contributors/views/filters.py
@@ -67,18 +67,14 @@ class Meta:  # noqa: WPS306
 
     def get_good_first_issue(self, queryset, name, value):  # noqa: WPS110
         """Filter issues by label 'good_first_issue'."""
-        good_first = ContributionLabel.objects.filter(
-            name='good first issue',
-        ).first()
-        all_open_issues = Contribution.objects.filter(
-            type='iss', info__state='open',
-        )
-        if good_first is None:
-            queryset = all_open_issues.none()
-        elif value:
-            queryset = all_open_issues.filter(
-                labels__in=[good_first.id],
-            )
+        if value:  # Only apply filter if checkbox is checked
+            good_first = ContributionLabel.objects.filter(
+                name='good first issue',
+            ).first()
+            if good_first:
+                queryset = queryset.filter(
+                    labels__in=[good_first.id], info__state='open',
+                )
         return queryset