Skip to content

Commit

Permalink
Fixes #14636 - correctly search puppet class on host form
Browse files Browse the repository at this point in the history
Searching for puppet classes that were ellipsized did not work as
expected on the host edit form. This was due to the search looking only
in the span content which was truncated and did not contain the entire
puppet class name. Also, cleaned up the js code to be clearer and more
efficiant.
  • Loading branch information
tbrisker authored and dLobatog committed Apr 14, 2016
1 parent f9f8b02 commit 0aacf33
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
13 changes: 4 additions & 9 deletions app/assets/javascripts/class_edit.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
function filter_puppet_classes(item){
var term = $(item).val().trim();
$('.puppetclass_group li.puppetclass.hide').addClass('hide-me');
var class_elems = $('.available_classes').find('.puppetclass_group, .puppetclass');
if (term.length > 0) {
$('.puppetclass_group li.puppetclass').removeClass('filter-marker').hide();
$('.puppetclass_group li.puppetclass:not(.hide-me, .selected-marker) span:contains('+term+')').parent('li').addClass('filter-marker').show();
} else{
$('.puppetclass_group li.puppetclass:not(.hide-me, .selected-marker)').addClass('filter-marker').show();
class_elems.hide().has('[data-class-name*='+term+']').show();
} else {
class_elems.show();
}
var groups = $('li.filter-marker').closest('.puppetclass_group');
$('.puppetclass_group').hide();
groups.show();
}

function add_puppet_class(item){
Expand Down Expand Up @@ -147,4 +143,3 @@ function removeIconIfEmpty(element, ul_id) {
element.find('i').hide();
}
}

2 changes: 1 addition & 1 deletion app/views/puppetclasses/_class_selection.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<% end %>
</div>

<div class="col-md-8">
<div class="col-md-8 available_classes">
<h3><%= _('Available Classes') %></h3>
<div class='clearfix'>
<div class='form-group col-md-6'>
Expand Down

0 comments on commit 0aacf33

Please sign in to comment.