add #facet_field_id for calculating an html id attribute for a facet …

…field
projectblacklight · Feb 28, 2014 · 14451a0 · 14451a0
1 parent a1473c6
commit 14451a0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/app/helpers/blacklight/facets_helper_behavior.rb b/app/helpers/blacklight/facets_helper_behavior.rb
@@ -198,6 +198,9 @@ def facet_display_value field, item
     end
   end
 
+  def facet_field_id facet_field
+    "facet-#{facet_field.field.parameterize}"
+  end
 
   private
 

diff --git a/app/views/catalog/_facet_layout.html.erb b/app/views/catalog/_facet_layout.html.erb
@@ -1,10 +1,10 @@
 <div class="panel panel-default facet_limit blacklight-<%= facet_field.field.parameterize %> <%= 'facet_limit-active' if facet_field_in_params?(facet_field.field) %>">
-  <div class="<%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle panel-heading" data-toggle="collapse" data-target="#facet-<%= facet_field.field.parameterize %>">
+  <div class="<%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle panel-heading" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>">
     <h5 class="panel-title">
       <%= link_to facet_field_label(facet_field.field), "#", :"data-no-turbolink" => true %>
     </h5>
   </div>
-  <div id="facet-<%= facet_field.field.parameterize %>" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'in' %>">
+  <div id="<%= facet_field_id(facet_field) %>" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'in' %>">
     <div class="panel-body">
       <%= yield %>
     </div>

diff --git a/spec/helpers/facets_helper_spec.rb b/spec/helpers/facets_helper_spec.rb
@@ -350,4 +350,10 @@
       expect(helper.facet_display_value('date_facet', '2012-01-01')).to eq '01 Jan 00:00'
     end
   end
+
+  describe "#facet_field_id" do
+    it "should be the parameterized version of the facet field" do
+      expect(helper.facet_field_id double(field: 'some field')).to eq "facet-some-field"
+    end
+  end
 end