External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-14 01:34:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6251 from chrismeyersfsu/fix-6235

Browse Source 
boolean logic performed on filter results
This commit is contained in:
Chris Meyers
2017-05-12 15:34:39 -04:00
committed by GitHub
parent 754f698b9b cc4692932a
commit 45d609e6a9
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/views.py
View File

@@ -1924,8 +1924,8 @@ class HostList(ListCreateAPIView):
qs = super(HostList, self).get_queryset()
filter_string = self.request.query_params.get('host_filter', None)
if filter_string:
filter_q = DynamicFilter.query_from_string(filter_string)
qs = qs.filter(filter_q)
filter_qs = DynamicFilter.query_from_string(filter_string)
qs &= filter_qs
return qs
def list(self, *args, **kwargs):