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 #1454 from wwitzel3/fix-role-summary

Browse Source 
Fix role summary when role description is overloaded
This commit is contained in:
Wayne Witzel III
2018-03-06 14:03:22 -05:00
committed by GitHub
parent 105b4982c4 8dce5c826c
commit a3b2f29478
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/main/models/rbac.py
View File

@@ -484,13 +484,25 @@ def role_summary_fields_generator(content_object, role_field):
global role_names global role_names
summary = {} summary = {}
description = role_descriptions[role_field] description = role_descriptions[role_field]
model_name = None
content_type = ContentType.objects.get_for_model(content_object) content_type = ContentType.objects.get_for_model(content_object)
if '%s' in description and content_type: if content_type:
model = content_object.__class__ model = content_object.__class__
model_name = re.sub(r'([a-z])([A-Z])', r'\1 \2', model.__name__).lower() model_name = re.sub(r'([a-z])([A-Z])', r'\1 \2', model.__name__).lower()
description = description % model_name
summary['description'] = description value = description
if type(description) == dict:
value = None
if model_name:
value = description.get(model_name)
if value is None:
value = description.get('default')
if '%s' in value and model_name:
value = value % model_name
summary['description'] = value
summary['name'] = role_names[role_field] summary['name'] = role_names[role_field]
summary['id'] = getattr(content_object, '{}_id'.format(role_field)) summary['id'] = getattr(content_object, '{}_id'.format(role_field))
return summary return summary