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

fix a CTinT bug in static config parsing

Browse Source 
see: #5223
This commit is contained in:
Ryan Petrello
2017-02-07 14:24:56 -05:00
parent a7e43034d7
commit 52ff35ab3f
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/conf/registry.py
View File

@@ -143,7 +143,7 @@ class SettingsRegistry(object):
field_instance.default = original_field_instance.to_representation(getattr(self.settings, setting))
except:
logger.warning('Unable to retrieve default value for user setting "%s".', setting, exc_info=True)
elif not field_instance.read_only or field_instance.default is empty or not field_instance.default:
elif not field_instance.read_only or field_instance.default is empty or field_instance.defined_in_file:
try:
field_instance.default = original_field_instance.to_representation(self.settings._awx_conf_settings._get_default(setting))
except AttributeError: