summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-24 15:59:06 +0000
committerGerrit Code Review <review@openstack.org>2015-02-24 15:59:07 +0000
commitec6faca6ae5f021b4a1531a04535d7b0c1b2b258 (patch)
tree24d968650ac1093c35048cffa182b4fc9e379e0e
parent4779614232bee8da8a7cd27a543c499d4665329d (diff)
parent5ca08bd2bec9875eba852d82f18bc85613a6c8f2 (diff)
downloadtuskar-ui-ec6faca6ae5f021b4a1531a04535d7b0c1b2b258.tar.gz
Merge "Use label for service config param if present"
-rw-r--r--tuskar_ui/infrastructure/parameters/forms.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tuskar_ui/infrastructure/parameters/forms.py b/tuskar_ui/infrastructure/parameters/forms.py
index d0b13c31..da51f6d8 100644
--- a/tuskar_ui/infrastructure/parameters/forms.py
+++ b/tuskar_ui/infrastructure/parameters/forms.py
@@ -70,7 +70,7 @@ def parameter_fields(request, prefix=None, read_only=False):
required=False,
widget=widget,
label=tuskar_ui.forms.label_with_tooltip(
- utils.de_camel_case(p.stripped_name),
+ p.label or utils.de_camel_case(p.stripped_name),
p.description,
),
initial=p.value,