From 09e64e3685731acc90c92e21a7298bdab3de9f37 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Tue, 5 Nov 2013 19:35:42 +0000 Subject: [PATCH] AC-608 Fixed form generator's ability to find labels related to rquired fields and add CSS class that prepends label text with '*'. --- awx/ui/static/lib/ansible/form-generator.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js index 404174412a..213725d970 100644 --- a/awx/ui/static/lib/ansible/form-generator.js +++ b/awx/ui/static/lib/ansible/form-generator.js @@ -104,17 +104,17 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities']) // Prepend an asterisk to required field label $('.form-control[required], input[type="radio"][required]').each(function() { if ( Empty($(this).attr('aw-required-when')) ) { - var label = $(this).parent().parent().find('label').first(); + var label = $(this).parent().parent().find('label'); if ($(this).attr('type') == 'radio') { - label = $(this).parent().parent().parent().find('label').first(); + label = $(this).parent().parent().parent().find('label'); } - if (label) { - var span = label.find('span').first(); - if (span && !span.hasClass('prepend-asterisk')) { - span.addClass('prepend-asterisk'); + if (label.length > 0) { + var span = label.children('span'); + if (span.length > 0 && !span.first().hasClass('prepend-asterisk')) { + span.first().addClass('prepend-asterisk'); } - else if (!label.hasClass('prepend-asterisk') && !label.find('.prepend-asterisk')) { - label.addClass('prepend-asterisk'); + else if (!label.first().hasClass('prepend-asterisk')) { + label.first().addClass('prepend-asterisk'); } } }