External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 22:37:41 -02:30
Code Issues Packages Projects Releases Wiki Activity

Inventory Update All no longer includes manual sources

Browse Source
This commit is contained in:
adamscmRH
2017-07-20 17:04:31 -04:00
parent d04a9a98b6
commit 3f9f28322c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/api/views.py
View File

@@ -2482,9 +2482,12 @@ class InventoryInventorySourcesUpdate(RetrieveAPIView):
inventory = self.get_object() inventory = self.get_object()
update_data = [] update_data = []
for inventory_source in inventory.inventory_sources.all(): for inventory_source in inventory.inventory_sources.all():
details = {'inventory_source': inventory_source.pk, if inventory_source.source == '':
'can_update': inventory_source.can_update} continue
update_data.append(details) else:
details = {'inventory_source': inventory_source.pk,
'can_update': inventory_source.can_update}
update_data.append(details)
return Response(update_data) return Response(update_data)
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
@@ -2503,7 +2506,8 @@ class InventoryInventorySourcesUpdate(RetrieveAPIView):
can_update = False can_update = False
else: else:
project_update = True project_update = True
if inventory_source.source == '':
continue
if can_update: if can_update:
if project_update: if project_update:
details['project_update'] = inventory_source.source_project.update().id details['project_update'] = inventory_source.source_project.update().id
@@ -2885,7 +2889,7 @@ class JobTemplateSurveySpec(GenericAPIView):
if survey_item["type"] == "password": if survey_item["type"] == "password":
if survey_item.get("default") and survey_item["default"].startswith('$encrypted$'): if survey_item.get("default") and survey_item["default"].startswith('$encrypted$'):
if not obj.survey_spec: if not obj.survey_spec:
return Response(dict(error=_("$encrypted$ is reserved keyword and may not be used as a default for password {}.".format(str(idx)))), return Response(dict(error=_("$encrypted$ is reserved keyword and may not be used as a default for password {}.".format(str(idx)))),
status=status.HTTP_400_BAD_REQUEST) status=status.HTTP_400_BAD_REQUEST)
else: else:
old_spec = obj.survey_spec old_spec = obj.survey_spec