From 7093e9501146212786ff920a6bf7d45b663ad433 Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouse@ansible.com>
Date: Wed, 30 Jul 2014 16:30:49 -0400
Subject: [PATCH] Form-generator Change handling of labelBind in form
 generator. It now adds ng-bind directive to a <span> element inside <label>
 rather than to <label> directly. This stops Angular from wiping out anything
 else we may want to add inside <label> like help icon.

---
 awx/ui/static/lib/ansible/form-generator.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index e48cd6e714..d82f082d4d 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -530,7 +530,6 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
                     var html = '';
                     if (field.label || field.labelBind) {
                         html += "<label ";
-                        html += (field.labelBind) ? "ng-bind=\"" + field.labelBind + "\" " : "";
                         if (horizontal || field.labelClass) {
                             html += "class=\"";
                             html += (field.labelClass) ? field.labelClass : "";
@@ -540,7 +539,11 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
                         html += (field.labelNGClass) ? "ng-class=\"" + field.labelNGClass + "\" " : "";
                         html += "for=\"" + fld + '">';
                         html += (field.icon) ? Icon(field.icon) : "";
-                        html += "<span class=\"label-text\">" + field.label + "</span>";
+                        if (field.labelBind) {
+                            html += "<span class=\"label-text\" ng-bind=\"" + field.labelBind + "\"></span>";
+                        } else {
+                            html += "<span class=\"label-text\">" + field.label + "</span>";
+                        }
                         html += (field.awPopOver && !field.awPopOverRight) ? Attr(field, 'awPopOver', fld) : "";
                         html += "</label>\n";
                     }