External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-23 05:55:59 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2531 from AlanCoding/everything_text_type

Browse Source 
Fix unicode bug in launch error message
This commit is contained in:
Alan Rominger
2018-07-16 10:49:44 -04:00
committed by GitHub
parent ac01eab0f1 e897cbd237
commit 53b4a4e2fc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -4294,7 +4294,7 @@ class JobLaunchSerializer(BaseSerializer):
errors.setdefault('credentials', []).append(_( errors.setdefault('credentials', []).append(_(
'Removing {} credential at launch time without replacement is not supported. ' 'Removing {} credential at launch time without replacement is not supported. '
'Provided list lacked credential(s): {}.' 'Provided list lacked credential(s): {}.'
).format(cred.unique_hash(display=True), ', '.join([str(c) for c in removed_creds]))) ).format(cred.unique_hash(display=True), ', '.join([six.text_type(c) for c in removed_creds])))
# verify that credentials (either provided or existing) don't # verify that credentials (either provided or existing) don't
# require launch-time passwords that have not been provided # require launch-time passwords that have not been provided

2
awx/main/models/credential/__init__.py
View File

@@ -419,7 +419,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
else: else:
fmt_str = six.text_type('{}_{}') fmt_str = six.text_type('{}_{}')
return fmt_str.format(type_alias, self.inputs.get('vault_id')) return fmt_str.format(type_alias, self.inputs.get('vault_id'))
return str(type_alias) return six.text_type(type_alias)
@staticmethod @staticmethod
def unique_dict(cred_qs): def unique_dict(cred_qs):