External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 09:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix InvSrc validation Organization requirement for new sources

Browse Source
This commit is contained in:
AlanCoding
2017-04-19 14:00:19 -04:00
parent 8c8ccba5a5
commit a066905997
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/api/serializers.py
View File

@@ -1471,7 +1471,13 @@ class InventorySourceOptionsSerializer(BaseSerializer):
errors['source_script'] = _("If 'source' is 'custom', 'source_script' must be provided.") errors['source_script'] = _("If 'source' is 'custom', 'source_script' must be provided.")
else: else:
try: try:
if source_script.organization != self.instance.inventory.organization: if not self.instance:
dest_inventory = attrs.get('inventory', None)
if not dest_inventory:
errors['inventory'] = _("Must provide an inventory.")
else:
dest_inventory = self.instance.inventory
if source_script.organization != dest_inventory.organization:
errors['source_script'] = _("The 'source_script' does not belong to the same organization as the inventory.") errors['source_script'] = _("The 'source_script' does not belong to the same organization as the inventory.")
except Exception as exc: except Exception as exc:
errors['source_script'] = _("'source_script' doesn't exist.") errors['source_script'] = _("'source_script' doesn't exist.")