Merge pull request #2398 from AlanCoding/2207_jt_sensitive_fields

Job Template can_change fixes and unit tests
This commit is contained in:
Alan Rominger
2016-06-15 11:07:56 -04:00
committed by GitHub
4 changed files with 63 additions and 3 deletions
+2 -2
View File
@@ -872,7 +872,7 @@ class JobTemplateAccess(BaseAccess):
self.check_license(feature='surveys')
return True
for required_field in ('credential', 'cloud_credential', 'inventory', 'project'):
for required_field in ('credential', 'cloud_credential', 'network_credential', 'inventory', 'project'):
required_obj = getattr(obj, required_field, None)
if required_field not in data_for_change and required_obj is not None:
data_for_change[required_field] = required_obj.pk
@@ -894,7 +894,7 @@ class JobTemplateAccess(BaseAccess):
for k, v in data.items():
if hasattr(obj, k) and getattr(obj, k) != v:
if k not in field_whitelist:
if k not in field_whitelist and v != getattr(obj, '%s_id' % k, None):
return False
return True