app/presenters/blacklight/document_presenter.rb in blacklight-7.15.2 vs app/presenters/blacklight/document_presenter.rb in blacklight-7.16.0

@@ -70,13 +70,13 @@
     def display_type(base_name = nil, default: nil)
       fields = []
       fields += Array.wrap(view_config[:"#{base_name}_display_type_field"]) if base_name && view_config.key?(:"#{base_name}_display_type_field")
       fields += Array.wrap(view_config.display_type_field)
 
-      if fields.empty?
-        fields += Array.wrap(configuration.show[:"#{base_name}_display_type_field"]) if base_name && configuration.show.key?(:"#{base_name}_display_type_field")
-        fields += Array.wrap(configuration.show.display_type_field)
+      if fields.empty? && show_view_config != view_config
+        fields += Array.wrap(show_view_config[:"#{base_name}_display_type_field"]) if base_name && show_view_config.key?(:"#{base_name}_display_type_field")
+        fields += Array.wrap(show_view_config.display_type_field)
       end
 
       fields += ['format'] if fields.empty? # backwards compatibility with the old default value for display_type_field
 
       display_type = fields.lazy.map { |field| field_presenter(field_config(field)) }.detect(&:any?)&.values
@@ -116,10 +116,14 @@
     def link_rel_alternates(options = {})
       LinkAlternatePresenter.new(view_context, document, options).render
     end
 
     def view_config
-      @view_config ||= configuration.view_config(:show)
+      @view_config ||= show_view_config
+    end
+
+    def show_view_config
+      configuration.view_config(:show)
     end
 
     private
 
     def render_field?(field_config)