use facet_display_value in render_facet_value

Author: cbeer

app/helpers/blacklight/facets_helper_behavior.rb

@@ -103,7 +103,7 @@ def facet_partial_name(display_facet = nil)
   # options consist of:
   # :suppress_link => true # do not make it a link, used for an already selected value for instance
   def render_facet_value(facet_solr_field, item, options ={})    
-    (link_to_unless(options[:suppress_link], item.label, add_facet_params_and_redirect(facet_solr_field, item), :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
+    (link_to_unless(options[:suppress_link], facet_display_value(facet_solr_field, item), add_facet_params_and_redirect(facet_solr_field, item), :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
   end
 
   # Standard display of a SELECTED facet value, no link, special span
@@ -217,7 +217,11 @@ def facet_in_params?(field, item)
   def facet_display_value field, item
     facet_config = facet_configuration_for_field(field)
 
-    value = facet_value_for_facet_item(item)
+    value = if item.respond_to? :label
+      value = item.label
+    else
+      facet_value_for_facet_item(item)
+    end
 
     display_label = case
       when facet_config.helper_method

spec/helpers/facets_helper_spec.rb

@@ -364,6 +364,25 @@
 
   end
 
+  describe "render_facet_value" do
+    it "should use facet_display_value" do
+      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(mock(:query => nil, :date => nil, :helper_method => nil, :single => false))
+ 
+      helper.should_receive(:facet_display_value).and_return('Z')
+      helper.should_receive(:add_facet_params_and_redirect).and_return('link')
+      helper.render_facet_value('simple_field', mock(:value => 'A', :hits => 10)).should == "<a href=\"link\" class=\"facet_select\">Z</a> <span class=\"count\">10</span>"
+    end
+
+
+    it "should suppress the link" do
+      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(mock(:query => nil, :date => nil, :helper_method => nil, :single => false))
+ 
+      helper.should_receive(:facet_display_value).and_return('Z')
+      helper.should_receive(:add_facet_params_and_redirect).and_return('link')
+      helper.render_facet_value('simple_field', mock(:value => 'A', :hits => 10), :suppress_link => true).should == "Z <span class=\"count\">10</span>"
+    end
+  end
+ 
   describe "#facet_display_value" do
     it "should just be the facet value for an ordinary facet" do
       helper.stub(:facet_configuration_for_field).with('simple_field').and_return(mock(:query => nil, :date => nil, :helper_method => nil))
@@ -374,7 +393,7 @@
       helper.stub(:facet_configuration_for_field).with('helper_field').and_return(mock(:query => nil, :date => nil, :helper_method => :my_facet_value_renderer))
 
       helper.should_receive(:my_facet_value_renderer).with('qwerty').and_return('abc')
-      
+
       helper.facet_display_value('helper_field', 'qwerty').should == 'abc'
     end