Merge pull request #22770 from edx/awais786/BOM-1084

BOM-1084

common/djangoapps/entitlements/api/v1/filters.py

@@ -18,10 +18,10 @@ class CharListFilter(filters.CharFilter):
 class UUIDListFilter(CharListFilter):
     """ Filters a field via a comma-delimited list of UUIDs. """
 
-    def __init__(self, name='uuid', label=None, widget=None, method=None, lookup_expr='in', required=False,
+    def __init__(self, field_name='uuid', label=None, widget=None, method=None, lookup_expr='in', required=False,
                  distinct=False, exclude=False, **kwargs):
         super(UUIDListFilter, self).__init__(
-            name=name,
+            field_name=field_name,
             label=label,
             widget=widget,
             method=method,
@@ -36,7 +36,7 @@ class UUIDListFilter(CharListFilter):
 class CourseEntitlementFilter(filters.FilterSet):
 
     uuid = UUIDListFilter()
-    user = filters.CharFilter(name='user__username')
+    user = filters.CharFilter(field_name='user__username')
 
     class Meta:
         model = CourseEntitlement

requirements/edx/base.in

@@ -43,7 +43,7 @@ django-cors-headers                 # Used to allow to configure CORS headers fo
 django-countries                    # Country data for Django forms and model fields
 django-crum                         # Middleware that stores the current request and user in thread local storage
 django-fernet-fields                # via edx-enterprise (should be added to its setup.py)
-django-filter==1.0.4                # Allows users to filter Django querysets dynamically
+django-filter                       # Allows users to filter Django querysets dynamically
 django-ipware                       # Get the client's real IP address
 django-method-override
 django-model-utils

requirements/edx/base.txt

@@ -61,7 +61,7 @@ django-cors-headers==2.5.3
 django-countries==5.5
 django-crum==0.7.5
 django-fernet-fields==0.6
-django-filter==1.0.4
+django-filter==2.2.0
 django-ipware==2.1.0
 django-js-asset==1.2.2    # via django-mptt
 django-method-override==0.2.0

requirements/edx/development.txt

@@ -74,7 +74,7 @@ django-countries==5.5
 django-crum==0.7.5
 django-debug-toolbar==1.11
 django-fernet-fields==0.6
-django-filter==1.0.4
+django-filter==2.2.0
 django-ipware==2.1.0
 django-js-asset==1.2.2
 django-method-override==0.2.0

requirements/edx/testing.txt

@@ -72,7 +72,7 @@ django-cors-headers==2.5.3
 django-countries==5.5
 django-crum==0.7.5
 django-fernet-fields==0.6
-django-filter==1.0.4
+django-filter==2.2.0
 django-ipware==2.1.0
 django-js-asset==1.2.2
 django-method-override==0.2.0