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

changed passwords_needed_to_start to take into acount if a credential is deleted

Browse Source
This commit is contained in:
Chris Meyers 2015-04-28 13:38:47 -04:00
parent 3c9887dc45
commit d77801353f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
awx/api/serializers.py
View File

@ -1775,13 +1775,14 @@ class JobLaunchSerializer(BaseSerializer):
passwords = self.context.get('passwords')
data = self.context.get('data')
credential = attrs.get('credential', None) or obj.credential
# fill passwords dict with request data passwords
if obj.passwords_needed_to_start:
if credential.passwords_needed:
try:
for p in obj.passwords_needed_to_start:
passwords[p] = data.get(p)
for p in credential.passwords_needed:
passwords[p] = data[p]
except KeyError:
raise serializers.ValidationError(obj.passwords_needed_to_start)
raise serializers.ValidationError(credential.passwords_needed)
return attrs
def validate(self, attrs):

2
awx/main/models/ad_hoc_commands.py
View File

@ -114,7 +114,7 @@ class AdHocCommand(UnifiedJob):
@property
def passwords_needed_to_start(self):
'''Return list of password field names needed to start the job.'''
if self.credential:
if self.credential and self.credential.active:
return self.credential.passwords_needed
else:
return []

2
awx/main/models/jobs.py
View File

@ -141,7 +141,7 @@ class JobOptions(BaseModel):
@property
def passwords_needed_to_start(self):
'''Return list of password field names needed to start the job.'''
if self.credential:
if self.credential and self.credential.active:
return self.credential.passwords_needed
else:
return []