From 0dc04cd0576b8a1767ffea4cec2ba2e0fd3bbfa4 Mon Sep 17 00:00:00 2001
From: Joe Fiorini <joe@joefiorini.com>
Date: Tue, 10 Mar 2015 10:03:25 -0400
Subject: [PATCH] Use columnNgClass instead of ngClass for columns

ngClass gets placed on both the td and the link (if an ngClick is
    provided); this is not good, therefore splitting them out into
ngClass for the link class (for backwards compatibility) and
columnNgClass for the class on the td.
---
 awx/ui/static/js/shared/generator-helpers.js | 3 ++-
 awx/ui/static/js/shared/list-generator.js    | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/awx/ui/static/js/shared/generator-helpers.js b/awx/ui/static/js/shared/generator-helpers.js
index 449016324b..dd88d7e9cc 100644
--- a/awx/ui/static/js/shared/generator-helpers.js
+++ b/awx/ui/static/js/shared/generator-helpers.js
@@ -330,6 +330,7 @@ angular.module('GeneratorHelpers', [])
 
             html = "<td class=\"" + fld + "-column";
             html += (field.columnClass) ? " " + field.columnClass : "";
+            html += (field.columnNgClass) ? "\" ng-class=\"" + field.columnNgClass : "";
             html += "\">\n";
             html += "<a ng-href=\"" + field.ngHref + "\" aw-tool-tip=\"" + field.awToolTip + "\"";
             html += (field.dataPlacement) ? " data-placement=\"" + field.dataPlacement + "\"" : "";
@@ -576,7 +577,7 @@ angular.module('GeneratorHelpers', [])
                     html += " " + field.columnClass;
                 }
                 html += "\" ";
-                html += (field.ngClass) ? Attr(field, 'ngClass') : "";
+                html += field.columnNgClass ? " ng-class=\"" + field.columnNgClass + "\"": "";
                 html += (options.mode === 'lookup' || options.mode === 'select') ? " ng-click=\"toggle_" + list.iterator +
                     "(" + list.iterator + ".id)\"" : "";
                 html += (field.columnShow) ? Attr(field, 'columnShow') : "";
diff --git a/awx/ui/static/js/shared/list-generator.js b/awx/ui/static/js/shared/list-generator.js
index bb40c7bed6..d5732529db 100644
--- a/awx/ui/static/js/shared/list-generator.js
+++ b/awx/ui/static/js/shared/list-generator.js
@@ -547,6 +547,11 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
                         else if (list.fields[fld].columnClass) {
                             html += " " + list.fields[fld].columnClass;
                         }
+
+                        if (list.fields[fld].columnNgClass) {
+                            html += "\" ng-class=\"" + list.fields[fld].columnNgClass
+                        }
+
                         html += "\" id=\"" + list.iterator + "-" + fld + "-header\"";
                         html += (list.fields[fld].columnShow) ? " ng-show=\"" + list.fields[fld].columnShow + "\" " : "";
                         html += (list.fields[fld].nosort === undefined || list.fields[fld].nosort !== true) ? " ng-click=\"sort('" + list.iterator + "','" + fld + "')\"" : "";