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

Merge pull request #5876 from AlanCoding/public_400

Browse Source 
Fix bug where setting toggle did not raise error it needed to

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-02-11 18:55:16 +00:00
committed by GitHub
parent 1f0294d389 0234df055d
commit b098127961
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
awx/main/conf.py
View File

@@ -845,10 +845,7 @@ def galaxy_validate(serializer, attrs):
to save settings which obviously break all project updates. to save settings which obviously break all project updates.
""" """
prefix = 'PRIMARY_GALAXY_' prefix = 'PRIMARY_GALAXY_'
errors = {}
from awx.main.constants import GALAXY_SERVER_FIELDS
if not any('{}{}'.format(prefix, subfield.upper()) in attrs for subfield in GALAXY_SERVER_FIELDS):
return attrs
def _new_value(setting_name): def _new_value(setting_name):
if setting_name in attrs: if setting_name in attrs:
@@ -857,10 +854,22 @@ def galaxy_validate(serializer, attrs):
return '' return ''
return getattr(serializer.instance, setting_name, '') return getattr(serializer.instance, setting_name, '')
if not _new_value('PRIMARY_GALAXY_URL'):
if _new_value('PUBLIC_GALAXY_ENABLED') is False:
msg = _('A URL for Primary Galaxy must be defined before disabling public Galaxy.')
# put error in both keys because UI has trouble with errors in toggles
for key in ('PRIMARY_GALAXY_URL', 'PUBLIC_GALAXY_ENABLED'):
errors.setdefault(key, [])
errors[key].append(msg)
raise serializers.ValidationError(errors)
from awx.main.constants import GALAXY_SERVER_FIELDS
if not any('{}{}'.format(prefix, subfield.upper()) in attrs for subfield in GALAXY_SERVER_FIELDS):
return attrs
galaxy_data = {} galaxy_data = {}
for subfield in GALAXY_SERVER_FIELDS: for subfield in GALAXY_SERVER_FIELDS:
galaxy_data[subfield] = _new_value('{}{}'.format(prefix, subfield.upper())) galaxy_data[subfield] = _new_value('{}{}'.format(prefix, subfield.upper()))
errors = {}
if not galaxy_data['url']: if not galaxy_data['url']:
for k, v in galaxy_data.items(): for k, v in galaxy_data.items():
if v: if v:
@@ -903,11 +912,6 @@ def galaxy_validate(serializer, attrs):
setting_name = '{}{}'.format(prefix, k.upper()) setting_name = '{}{}'.format(prefix, k.upper())
errors.setdefault(setting_name, []) errors.setdefault(setting_name, [])
errors[setting_name].append(msg) errors[setting_name].append(msg)
if not galaxy_data['url']:
if _new_value('PUBLIC_GALAXY_ENABLED') is False:
errors.setdefault('PUBLIC_GALAXY_ENABLED', [])
msg = _('A URL for Primary Galaxy must be defined before disabling public Galaxy.')
errors['PUBLIC_GALAXY_ENABLED'].append(msg)
if errors: if errors:
raise serializers.ValidationError(errors) raise serializers.ValidationError(errors)