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

add a field to OPTIONS that tells if the setting came from a .py file

Browse Source 
additionally, update help_text with a helpful message about this

See: #4876
This commit is contained in:
Ryan Petrello
2017-02-02 11:44:42 -05:00
parent 1ab62a48ed
commit afc0f16e58
5 changed files with 61 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/conf/registry.py
View File

@@ -116,6 +116,7 @@ class SettingsRegistry(object):
placeholder = field_kwargs.pop('placeholder', empty)
feature_required = field_kwargs.pop('feature_required', empty)
encrypted = bool(field_kwargs.pop('encrypted', False))
defined_in_file = bool(field_kwargs.pop('defined_in_file', False))
if getattr(field_kwargs.get('child', None), 'source', None) is not None:
field_kwargs['child'].source = None
field_instance = field_class(**field_kwargs)
@@ -126,6 +127,13 @@ class SettingsRegistry(object):
field_instance.placeholder = placeholder
if feature_required is not empty:
field_instance.feature_required = feature_required
field_instance.defined_in_file = defined_in_file
if field_instance.defined_in_file:
field_instance.help_text = (
str(_('This value has been set manually in a settings file.')) +
'\n\n' +
str(field_instance.help_text)
)
field_instance.encrypted = encrypted
original_field_instance = field_instance
if field_class != original_field_class: