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

Merge pull request #5531 from ryanpetrello/fix-5470

Browse Source 
retain the default interstitial value for TOWER_URL_BASE
This commit is contained in:
Ryan Petrello
2017-02-23 16:55:08 -05:00
committed by GitHub
parent fd7c2550ee 5dfdef6e6b
commit 7ad819649c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/metadata.py
View File

@@ -68,7 +68,7 @@ class Metadata(metadata.SimpleMetadata):
# FIXME: Still isn't showing all default values? # FIXME: Still isn't showing all default values?
try: try:
default = field.get_default() default = field.get_default()
if not default and field.field_name == 'TOWER_URL_BASE': if field.field_name == 'TOWER_URL_BASE' and default == 'https://towerhost':
default = '{}://{}'.format(self.request.scheme, self.request.get_host()) default = '{}://{}'.format(self.request.scheme, self.request.get_host())
field_info['default'] = default field_info['default'] = default
except serializers.SkipField: except serializers.SkipField:

2
awx/settings/defaults.py
View File

@@ -861,7 +861,7 @@ ORG_ADMINS_CAN_SEE_ALL_USERS = True
TOWER_ADMIN_ALERTS = True TOWER_ADMIN_ALERTS = True
# Note: This setting may be overridden by database settings. # Note: This setting may be overridden by database settings.
TOWER_URL_BASE = "" TOWER_URL_BASE = "https://towerhost"
TOWER_SETTINGS_MANIFEST = {} TOWER_SETTINGS_MANIFEST = {}