shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

Merge pull request #364 from AlanCoding/null_inv_val

Browse Source 
more coherent source_script & inv validation
This commit is contained in:
Alan Rominger 2017-08-30 10:35:04 -04:00 committed by GitHub
commit de3b9fc70d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/api/serializers.py
View File

@ -1551,11 +1551,11 @@ class InventorySourceOptionsSerializer(BaseSerializer):
errors['inventory'] = _("Must provide an inventory.")
else:
dest_inventory = self.instance.inventory
if source_script.organization != dest_inventory.organization:
if dest_inventory and source_script.organization != dest_inventory.organization:
errors['source_script'] = _("The 'source_script' does not belong to the same organization as the inventory.")
except Exception as exc:
except Exception:
errors['source_script'] = _("'source_script' doesn't exist.")
logger.error(str(exc))
logger.exception('Problem processing source_script validation.')
if errors:
raise serializers.ValidationError(errors)
@ -1670,7 +1670,7 @@ class InventorySourceSerializer(UnifiedJobTemplateSerializer, InventorySourceOpt
return value
def validate_inventory(self, value):
if value.kind == 'smart':
if value and value.kind == 'smart':
raise serializers.ValidationError({"detail": _("Cannot create Inventory Source for Smart Inventory")})
return value