display read-only settings in the API settings endpoint

References #4665
This commit is contained in:
Ryan Petrello 2017-01-30 09:23:13 -05:00
parent 3b5471dbcf
commit 4fcc74012d

View File

@ -127,7 +127,7 @@ class SettingsRegistry(object):
field_instance.default = original_field_instance.to_representation(getattr(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:
elif not field_instance.read_only or field_instance.default is empty or not field_instance.default:
try:
field_instance.default = original_field_instance.to_representation(settings._awx_conf_settings._get_default(setting))
except AttributeError: