Fix date filtering being ambiguous

closes #3557 https://pulp.plan.io/issues/3557
pulp · Apr 12, 2018 · dda4d7d · dda4d7d
1 parent 3087143
commit dda4d7d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/pulpcore/pulpcore/app/viewsets/repository.py b/pulpcore/pulpcore/app/viewsets/repository.py
@@ -190,15 +190,13 @@ class RepositoryVersionFilter(filterset.FilterSet):
     version_min = filters.NumberFilter(name='number', lookup_expr='gte')
     version_max = filters.NumberFilter(name='number', lookup_expr='lte')
 
-    created_after = filters.IsoDateTimeFilter(name='created', lookup_expr='gte')
-    created_before = filters.IsoDateTimeFilter(name='created', lookup_expr='lte')
 
+    created = filters.IsoDateTimeFilter(name='created')
     content = RepositoryVersionContentFilter(label="Content HREF is equivalent to")
 
     class Meta:
         model = RepositoryVersion
-
-        fields = ['version_min', 'version_max', 'created_after', 'created_before', 'content']
+        fields = ['version_min', 'version_max', 'created', 'content']
 
 
 class RepositoryVersionViewSet(NamedModelViewSet,

diff --git a/pulpcore/pulpcore/app/viewsets/task.py b/pulpcore/pulpcore/app/viewsets/task.py
@@ -14,17 +14,13 @@ class TaskFilter(filterset.FilterSet):
     state_in_list = CharInFilter(name='state', lookup_expr='in')
     worker = HyperlinkRelatedFilter(name='worker')
 
-    started_after = filters.IsoDateTimeFilter(name='started_at', lookup_expr='gte')
-    started_before = filters.IsoDateTimeFilter(name='started_at', lookup_expr='lte')
 
-    finished_after = filters.IsoDateTimeFilter(name='finished_at', lookup_expr='gte')
-    finished_before = filters.IsoDateTimeFilter(name='finished_at', lookup_expr='lte')
+    started_at = filters.IsoDateTimeFilter(name='started_at')
+    finished_at = filters.IsoDateTimeFilter(name='finished_at')
 
     class Meta:
         model = Task
-        fields = ('state', 'state_in_list', 'worker',
-                  'started_after', 'started_before',
-                  'finished_after', 'finished_before')
+        fields = ('state', 'state_in_list', 'worker', 'started_at', 'finished_at')
 
 
 class TaskViewSet(NamedModelViewSet,