mirror of
https://github.com/ansible/awx.git
synced 2026-06-28 09:58:03 -02:30
Resolve review comments
This commit is contained in:
@@ -213,13 +213,23 @@ class ApiV2(base.Base):
|
||||
assets = (self._export(asset, post_fields) for asset in endpoint.results)
|
||||
return [asset for asset in assets if asset is not None]
|
||||
|
||||
def _check_for_int(self, value):
|
||||
return isinstance(value, int) or (isinstance(value, str) and value.isdecimal())
|
||||
|
||||
def _filtered_list(self, endpoint, value):
|
||||
if isinstance(value, int) or value.isdecimal():
|
||||
if isinstance(value, list) and len(value) == 1:
|
||||
value = value[0]
|
||||
if self._check_for_int(value):
|
||||
return endpoint.get(id=int(value))
|
||||
|
||||
options = self._cache.get_options(endpoint)
|
||||
identifier = next(field for field in options['search_fields'] if field in ('name', 'username', 'hostname'))
|
||||
if len(value.split(',')) > 0:
|
||||
identifier += '__in'
|
||||
if isinstance(value, list):
|
||||
if all(self._check_for_int(item) for item in value):
|
||||
identifier = 'or__id'
|
||||
else:
|
||||
identifier = 'or__' + identifier
|
||||
|
||||
return endpoint.get(**{identifier: value}, all_pages=True)
|
||||
|
||||
def export_assets(self, **kwargs):
|
||||
|
||||
Reference in New Issue
Block a user