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

prevent unicode errors in cred unique_hash

Browse Source
This commit is contained in:
AlanCoding
2018-04-03 12:33:56 -04:00
parent 652bdf7875
commit 9695031b27
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ import os
import re
import stat
import tempfile
import six
# Jinja2
from jinja2 import Template
@@ -415,9 +416,9 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
type_alias = self.credential_type_id
if self.kind == 'vault' and self.inputs.get('vault_id', None):
if display:
fmt_str = '{} (id={})'
fmt_str = six.text_type('{} (id={})')
else:
fmt_str = '{}_{}'
fmt_str = six.text_type('{}_{}')
return fmt_str.format(type_alias, self.inputs.get('vault_id'))
return str(type_alias)