[Enhancement] In quota filter, display the str instead of the scope name

HewlettPackard · Nov 20, 2023 · 5f452a0 · 5f452a0
1 parent ccb54b9
commit 5f452a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/service_catalog/filters/instance_filter.py b/service_catalog/filters/instance_filter.py
@@ -3,7 +3,7 @@
 from django.db.models import Q
 from django.forms import CheckboxInput, SelectMultiple
 from django.utils.translation import gettext_lazy as _
-from django_filters import MultipleChoiceFilter, BooleanFilter, BaseInFilter, CharFilter
+from django_filters import MultipleChoiceFilter, BooleanFilter, BaseInFilter, CharFilter, ModelMultipleChoiceFilter
 
 from Squest.utils.squest_filter import SquestFilter
 from profiles.models import Scope, AbstractScope
@@ -30,9 +30,7 @@ class Meta:
         fields = ['id', 'name', 'requester', 'service', 'state', 'quota_scope']
 
     state = MultipleChoiceFilter(choices=InstanceState.choices)
-    quota_scope = MultipleChoiceFilter(
-        choices=AbstractScope.objects.filter(id__in=Scope.objects.values_list("id", flat=True)).values_list("id",
-                                                                                                            "name"))
+    quota_scope = ModelMultipleChoiceFilter(queryset=Scope.objects.all())
     service = MultipleChoiceFilter(choices=Service.objects.values_list("id", "name"))
     requester = MultipleChoiceFilter(choices=User.objects.values_list("id", "username"))
     no_requesters = BooleanFilter(method='no_requester', label="No requester", widget=CheckboxInput())

diff --git a/service_catalog/filters/request_filter.py b/service_catalog/filters/request_filter.py
@@ -1,6 +1,6 @@
 from django.contrib.auth.models import User
 from django.forms import SelectMultiple, HiddenInput
-from django_filters import MultipleChoiceFilter
+from django_filters import MultipleChoiceFilter, ModelMultipleChoiceFilter
 
 from Squest.utils.squest_filter import SquestFilter
 from profiles.models import Scope, AbstractScope
@@ -20,10 +20,9 @@ class Meta:
         choices=[],
         widget=SelectMultiple(attrs={'data-live-search': "true"}))
 
-    instance__quota_scope = MultipleChoiceFilter(
+    instance__quota_scope = ModelMultipleChoiceFilter(
         label="Quota scope",
-        choices=AbstractScope.objects.filter(id__in=Scope.objects.values_list("id", flat=True)).values_list("id",
-                                                                                                            "name"),
+        queryset=Scope.objects.all(),
         widget=SelectMultiple(attrs={'data-live-search': "true"}))
 
     operation__type = MultipleChoiceFilter(