blacklight 7.4.1 → 7.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e85413f5ec17400714a059ee6085c1dd7df348697cecf371d4d1aef37d1025c6
-  data.tar.gz: 05ac84ca08a7ba17f6eec011e06df185523c96d0562b255c0b5cdfc777e3e2bb
+  metadata.gz: e934144a8f41701622a5173bbafbc5ed5e362035ab2b8e1385a44b62e1e9fb0e
+  data.tar.gz: 7f70a70e1cd8912173c85a4e6f75e5dc0616735a80ddaa1a92b3f8c8718bdca4
 SHA512:
-  metadata.gz: e510c3ca5b812ea54cfabeb5f601ff90a016b13a9cdf7c9c762875d2f68807aa1dbb98adcbf6b0c3bccb42bc12b724480e447f12ea2921730ac4ef27b40e9215
-  data.tar.gz: 18bf32778bae7470b066341bd99fb170e50048cee6c54ed319fbf9c113adcc922a72ae65492bae2d4cfeaec24b4ede3aa5a37345c7ba655765505b224b3ed6fc
+  metadata.gz: 60909c87a1875508abe174257d0d80448113d2e62a1dc66b65a382f8acf8f539b91e70439b9bb3f1ecd7d30c9ccc6136f2ea586711866eabd0d453244d4db6c3
+  data.tar.gz: c042494903310dfb577677e7b98aa82a4551c877beb2b1082dd6d356057f50e0539291e943118667b6f33b912f9600bd5841f8132e9dc19e32b7ffac7fa5957c

data/VERSION

@@ -1 +1 @@
-7.4.1
+7.4.2

data/app/presenters/blacklight/document_presenter.rb

@@ -47,7 +47,7 @@ module Blacklight
       display_type = fields.lazy.map { |field| retrieve_values(field_config(field)) }.detect(&:any?)
       display_type ||= Array(default) if default
 
-      display_type
+      display_type || []
     end
 
     ##

data/app/views/catalog/_facet_limit.html.erb

@@ -4,7 +4,7 @@
 
   <% unless paginator.last_page? || params[:action] == "facet" %>
     <li class="more_facets">
-      <%= link_to t("more_#{field_name}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: facet_field.label), 
+      <%= link_to t("more_#{field_name}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: facet_field_label(facet_field.key)), 
         search_facet_path(id: facet_field.key),
         data: { blacklight_modal: 'trigger' } %>
     </li>

data/app/views/catalog/_field.json.jbuilder

@@ -5,6 +5,6 @@ json.set!(field_name) do
   json.type 'document_value'
   json.attributes do
     json.value doc_presenter.field_value(field)
-    json.label field.label
+    json.label field.display_label(view_type)
   end
 end

data/app/views/catalog/_per_page_widget.html.erb

@@ -6,7 +6,7 @@
   </button>
   <div class="dropdown-menu dropdown-menu-right" role="menu">
     <%- per_page_options_for_select.each do |(label, count)| %>
-      <%= link_to(label, url_for(search_state.params_for_search(per_page: count)), class: 'dropdown-item') %>
+      <%= link_to(label, url_for(search_state.params_for_search(per_page: count)), class: 'dropdown-item', role: 'menuitem') %>
     <%- end -%>
   </div>
 </div>

data/app/views/catalog/_sort_widget.html.erb

@@ -6,7 +6,7 @@
 
   <div class="dropdown-menu" role="menu">
     <%- active_sort_fields.each do |sort_key, field_config| %>
-      <%= link_to(sort_field_label(sort_key), url_for(search_state.params_for_search(sort: sort_key)), class: 'dropdown-item') %>
+      <%= link_to(sort_field_label(sort_key), url_for(search_state.params_for_search(sort: sort_key)), class: 'dropdown-item', role: 'menuitem') %>
     <%- end -%>
   </div>
 </div>

data/app/views/catalog/index.json.jbuilder

@@ -21,7 +21,8 @@ json.data do
         json.partial! 'field', field: field,
                                field_name: field_name,
                                document_url: document_url,
-                               doc_presenter: doc_presenter
+                               doc_presenter: doc_presenter,
+                               view_type: 'index'
       end
     end
 

data/app/views/catalog/show.json.jbuilder

@@ -15,7 +15,8 @@ json.data do
       json.partial! 'field', field: field,
                              field_name: field_name,
                              document_url: document_url,
-                             doc_presenter: doc_presenter
+                             doc_presenter: doc_presenter,
+                             view_type: 'show'
     end
   end
 end

data/config/locales/blacklight.ar.yml

@@ -1,7 +1,7 @@
 ar:
   views:
     pagination:
-      first: 'الأولى ;&laquo'
+      first: 'الأولى «'
       last: 'الأخيرة »'
       previous: '« السابقة'
       next: 'التالية »'

data/spec/presenters/blacklight/index_presenter_spec.rb

@@ -183,4 +183,32 @@ RSpec.describe Blacklight::IndexPresenter, api: true do
 
     it { is_expected.to be_instance_of Blacklight::ThumbnailPresenter }
   end
+
+  describe '#display_type' do
+    context 'with no configuration' do
+      it 'returns an empty array' do
+        expect(presenter.display_type).to be_empty
+      end
+    end
+
+    context 'with a default value' do
+      it 'returns the default' do
+        expect(presenter.display_type(default: 'default')).to eq ['default']
+      end
+    end
+
+    context 'with field configuration' do
+      let(:document) do
+        SolrDocument.new(id: 1, xyz: 'abc')
+      end
+
+      before do
+        config.index.display_type_field = :xyz
+      end
+
+      it 'returns the value from the field' do
+        expect(presenter.display_type).to eq ['abc']
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.4.1
+  version: 7.4.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails