Merge "Fix slugify call"

This commit is contained in:
Jenkins 2014-11-21 14:43:19 +00:00 committed by Gerrit Code Review
commit 5ca54d7c69
3 changed files with 5 additions and 6 deletions

View File

@ -118,13 +118,12 @@ class IndexView(horizon.forms.ModalFormView, StackMixin):
'roles': [{
'status': role.get('status', 'warning'),
'finished': role.get('finished', False),
'name': role.get('name', '').capitalize(),
'slug': django.util.text.slugify(role.get('name', '')),
'name': role.get('name', ''),
'slug': django.utils.text.slugify(role.get('name', '')),
'id': role.get('id', ''),
'total_node_count': role.get('node_count', 0),
'deployed_node_count': role.get('deployed_node_count', 0),
'deploying_node_count': role.get('deploying_node_count',
0),
'deploying_node_count': role.get('deploying_node_count', 0),
'waiting_node_count': role.get('waiting_node_count', 0),
'error_node_count': role.get('error_node_count', 0),
'planned_node_count': role.get('planned_node_count', 0),

View File

@ -18,7 +18,7 @@
<a
href="{% url 'horizon:infrastructure:roles:detail' role_id=role.id %}"
class="deployment-roles-label"
>{{ role.name|capfirst }}</a>
>{{ role.name }}</a>
{% for error in role.field.errors %}
<span class="help-block"><span class="text-danger">
{{ error }}

View File

@ -16,7 +16,7 @@
<div class="col-xs-8 deploy-role-name">
<strong
class="deployment-roles-label"
>{{ role.name|capfirst }}</strong>
>{{ role.name }}</strong>
</div>
<div class="col-xs-2 deploy-role-count">
{% if role.finished %}