blacklight-spotlight 0.4.1 → 0.5.0

data/app/assets/stylesheets/spotlight/_pages.scss

@@ -103,14 +103,23 @@
 }
 
 .contact-photo {
-    border: 1px solid #CCC;
-    float: left;
-    margin-right: 15px;
+  border: 1px solid #ccc;
+  border-radius: $border-radius-base;
+  float: left;
+  margin-right: 15px;
+  margin-top: 3px;
+}
+
+// Indent contact fields so they align evenly, only when there is a contact photo
+.sidenav.contacts .contact-photo + div[itemprop] ~ div[itemprop] {
+  margin-left: 87px;
 }
 
 .item-grid-block {
   h3 {margin-top: 0;}
   .items-col {
+    margin-bottom: 1em;
+    z-index: 1;
     display: flex;
     flex-flow: row wrap;
     justify-content: space-between;
@@ -143,7 +152,11 @@
       min-width: 25%;
       height: 120px;
       @media (min-width: $screen-lg-min) {
-        height: 135px;
+        height: 170px; // default: no sidebar, no text column
+        // reduce height if on a page with a sidebar or text column, because will be less wide
+        .col-md-9 & {
+          height: 135px;
+        }
       }
       padding: 5px;
     }
@@ -159,15 +172,20 @@
     .item-0, .item-1, .item-2 {
       height: 220px;
       order: 0;
-
       @media (min-width: $screen-lg-min) {
-        height: 240px;
+        height: 280px; // default: no sidebar, no text column
+        // reduce height if on a page with a sidebar or text column, because will be less wide
+        .col-md-9 & {
+          height: 240px;
+        }
       }
     }
-
   }
   @media (max-width: $screen-sm-max) {
-    .items-col {margin-bottom: $line-height-computed;}
+    &.items-block .items-col {margin-bottom: $line-height-computed;}
+  }
+  @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+    &.items-block .items-col .box {min-width: 128px;}
   }
 }
 
@@ -205,9 +223,42 @@
   }
 }
 
-.items-block .content-block {
-  @media (max-width: $screen-sm-max) {
-    margin-bottom: 0;
+.items-block {
+
+  .text-col {
+    float: none;
+    width: auto;
+  }
+  .items-col {
+    z-index: 1;
+
+    @media (max-width: $screen-sm-max) {
+      margin-bottom: 0;
+    }
+
+    .box {
+      min-width: 150px;
+    }
+
+    /* two items */
+    .box:first-child:nth-last-child(2),
+    .box:first-child:nth-last-child(2) ~ .box {
+        min-width: 250px;
+    }
+
+    /* only images, no text */
+    &:last-child {
+      .box {
+        padding: 0.25em;
+        img {
+          height: 250px;
+          object-fit: cover;
+          @media (max-width: $screen-sm-max) {
+            height: 175px;
+          }
+        }
+      }
+    }
   }
 }
 

data/app/assets/stylesheets/spotlight/_report_a_problem.scss

@@ -1,4 +1,5 @@
 #report-problem-form {
   display: none;
   background-color: #e7e7e7;
+  border-bottom: 1px dotted $gray-light;
 }

data/app/assets/stylesheets/spotlight/_spotlight.scss

@@ -24,6 +24,7 @@
 @import "spotlight/blacklight_configuration";
 @import "spotlight/typeahead";
 @import "spotlight/bootstrap_overrides";
+@import "spotlight/blacklight_overrides";
 @import "spotlight/report_a_problem";
 
 

data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb

@@ -1,28 +1,35 @@
-# The BootstrapBreadcrumbsBuilder is a Bootstrap compatible breadcrumb builder.
-# It provides basic functionalities to render a breadcrumb navigation according to Bootstrap's conventions.
-#
-# BootstrapBreadcrumbsBuilder accepts a limited set of options:
-#
-# You can use it with the :builder option on render_breadcrumbs:
-#     <%= render_breadcrumbs :builder => Spotlight::BootstrapBreadcrumbsBuilder %>
-#
-class Spotlight::BootstrapBreadcrumbsBuilder < BreadcrumbsOnRails::Breadcrumbs::Builder
-  include ActionView::Helpers::OutputSafetyHelper
-  def render
-    if @elements.blank?
-      return ""
+module Spotlight
+  # The BootstrapBreadcrumbsBuilder is a Bootstrap compatible breadcrumb builder.
+  # It provides basic functionalities to render a breadcrumb navigation according to Bootstrap's conventions.
+  #
+  # BootstrapBreadcrumbsBuilder accepts a limited set of options:
+  #
+  # You can use it with the :builder option on render_breadcrumbs:
+  #     <%= render_breadcrumbs :builder => Spotlight::BootstrapBreadcrumbsBuilder %>
+  #
+  class BootstrapBreadcrumbsBuilder < BreadcrumbsOnRails::Breadcrumbs::Builder
+    include ActionView::Helpers::OutputSafetyHelper
+
+    def render
+      return '' if @elements.blank?
+
+      @context.content_tag(:ul, class: 'breadcrumb') do
+        safe_join(@elements.uniq.map { |e| render_element(e) })
+      end
     end
 
-    @context.content_tag(:ul, class: 'breadcrumb') do
-      safe_join(@elements.uniq.collect {|e| render_element(e)})
-    end 
-  end
+    def render_element(element)
+      html_class = 'active' if @context.current_page?(compute_path(element))
+
+      @context.content_tag(:li, class: html_class) do
+        @context.link_to_unless_current(element_label(element), compute_path(element), element.options)
+      end
+    end
 
-  def render_element(element)
-    html_class = 'active' if @context.current_page?(compute_path(element))
+    private
 
-    @context.content_tag(:li, :class => html_class) do
-      @context.link_to_unless_current(@context.truncate(compute_name(element), length: 30, separator: ' '), compute_path(element), element.options)
+    def element_label(element)
+      @context.truncate(compute_name(element), length: 30, separator: ' ')
     end
   end
 end

data/app/controllers/spotlight/about_pages_controller.rb

@@ -1,8 +1,9 @@
 module Spotlight
+  ##
+  # CRUD actions for about pages and contacts
   class AboutPagesController < PagesController
     load_and_authorize_resource through: :exhibit, instance_name: 'page'
-    before_filter :attach_breadcrumbs, except: [:update_contacts]
-
+    before_action :attach_breadcrumbs, except: [:update_contacts]
 
     def update_contacts
       if @exhibit.update(contact_params)
@@ -17,32 +18,42 @@ module Spotlight
     def attach_breadcrumbs
       super
       if @page
-        if action_name == 'edit'
-          add_breadcrumb t(:'spotlight.pages.index.about_pages.header'), exhibit_about_pages_path(@exhibit)
-        else
-          add_breadcrumb (@exhibit.main_navigations.about.label_or_default), [@exhibit, @exhibit.main_about_page]
-        end
-
-        unless @page == @exhibit.main_about_page
-          add_breadcrumb @page.title, action_name == 'edit' ? [:edit, @page.exhibit, @page] : [@page.exhibit, @page] 
-        end
+        attach_section_breadcrumbs
+        attach_page_breadcrumbs
       elsif action_name == 'index'
         add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
         add_breadcrumb t(:'spotlight.pages.index.about_pages.header'), exhibit_about_pages_path(@exhibit)
       end
     end
 
+    def attach_page_breadcrumbs
+      return if @page == @exhibit.main_about_page
+
+      if action_name == 'edit'
+        add_breadcrumb @page.title, [:edit, @page.exhibit, @page]
+      else
+        add_breadcrumb @page.title, [@page.exhibit, @page]
+      end
+    end
+
+    def attach_section_breadcrumbs
+      if action_name == 'edit'
+        add_breadcrumb t(:'spotlight.pages.index.about_pages.header'), exhibit_about_pages_path(@exhibit)
+      else
+        add_breadcrumb((@exhibit.main_navigations.about.label_or_default), [@exhibit, @exhibit.main_about_page])
+      end
+    end
+
     def contact_params
-      params.require(:exhibit).permit("contacts_attributes" => [:id, :show_in_sidebar, :weight])
+      params.require(:exhibit).permit('contacts_attributes' => [:id, :show_in_sidebar, :weight])
     end
 
     def update_all_page_params
-      params.require(:exhibit).permit( "about_pages_attributes" => page_attributes)
+      params.require(:exhibit).permit('about_pages_attributes' => page_attributes)
     end
 
     def allowed_page_params
       super.concat [:published]
     end
-
   end
 end

data/app/controllers/spotlight/appearances_controller.rb

@@ -1,38 +1,42 @@
-class Spotlight::AppearancesController < Spotlight::ApplicationController
-  before_filter :authenticate_user!
-  load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
-  before_filter :load_and_authorize_appearance
+module Spotlight
+  ##
+  # Edit and update an exhibit's appearance
+  class AppearancesController < Spotlight::ApplicationController
+    before_action :authenticate_user!
+    load_and_authorize_resource id_param: :exhibit_id, instance_name: 'exhibit', class: 'Spotlight::Exhibit', parent: false
 
-  def update
-    if @appearance.update(appearance_params)
-      redirect_to edit_exhibit_appearance_path(@exhibit), notice: t(:'helpers.submit.spotlight_default.updated', model: @appearance.class.model_name.human.downcase)
-    else
-      render 'edit'
+    def update
+      if @exhibit.update(exhibit_params)
+        notice = t(:'helpers.submit.spotlight_default.updated', model: @exhibit.class.model_name.human.downcase)
+        redirect_to edit_exhibit_appearance_path(@exhibit), notice: notice
+      else
+        render 'edit'
+      end
     end
-  end
-
-  def edit
-    add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-    add_breadcrumb t(:'spotlight.administration.sidebar.header'), exhibit_dashboard_path(@exhibit)
-    add_breadcrumb t(:'spotlight.administration.sidebar.appearance'), edit_exhibit_appearance_path(@exhibit)
-  end
 
-  protected
+    def edit
+      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
+      add_breadcrumb t(:'spotlight.administration.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.administration.sidebar.appearance'), edit_exhibit_appearance_path(@exhibit)
+    end
 
-  def load_and_authorize_appearance
-    @appearance = @exhibit.appearance
-    authorize! action_name.to_sym, @appearance
-  end
+    protected
 
-  def appearance_params
-    params.require(:appearance).permit(:default_per_page, :searchable,
-      document_index_view_types: @appearance.view_type_options,
-      main_navigations: [:id, :display, :label, :weight],
-      masthead: featured_image_params,
-      thumbnail: featured_image_params)
-  end
+    def exhibit_params
+      params.require(:exhibit).permit(main_navigations_attributes: [:id, :display, :label, :weight],
+                                      masthead_attributes: featured_image_params,
+                                      thumbnail_attributes: featured_image_params)
+    end
 
-  def featured_image_params
-    [:display, :source, :image, :remote_image_url, :document_global_id, :image_crop_x, :image_crop_y, :image_crop_w, :image_crop_h]
+    def featured_image_params
+      [
+        :display,
+        :source,
+        :image,
+        :remote_image_url,
+        :document_global_id,
+        :image_crop_x, :image_crop_y, :image_crop_w, :image_crop_h
+      ]
+    end
   end
 end

data/app/controllers/spotlight/application_controller.rb

@@ -1,12 +1,13 @@
 require 'spotlight'
 
 module Spotlight
+  ##
   # Inherit from the host app's ApplicationController
   # This will configure e.g. the layout used by the host
   class ApplicationController < ::ApplicationController
     include Spotlight::Concerns::ApplicationController
 
-    before_filter do
+    before_action do
       flash.now[:notice] = flash[:notice].html_safe if flash[:html_safe] && flash[:notice]
     end
   end

data/app/controllers/spotlight/attachments_controller.rb

@@ -1,14 +1,16 @@
 module Spotlight
+  ##
+  # Create image attachments for the sir-trevor image widget
   class AttachmentsController < ApplicationController
-    before_filter :authenticate_user!
-    load_and_authorize_resource :exhibit, class: "Spotlight::Exhibit"
+    before_action :authenticate_user!
+    load_and_authorize_resource :exhibit, class: 'Spotlight::Exhibit'
     load_and_authorize_resource through: :exhibit
 
     # POST /attachments
     def create
       @attachment.attributes = attachment_params
       if @attachment.save
-        render :json => @attachment
+        render json: @attachment
       else
         render action: 'new'
       end
@@ -16,9 +18,9 @@ module Spotlight
 
     private
 
-      # Only allow a trusted parameter "white list" through.
-      def attachment_params
-        params.require(:attachment).permit(:name, :file, :uid)
-      end
+    # Only allow a trusted parameter "white list" through.
+    def attachment_params
+      params.require(:attachment).permit(:name, :file, :uid)
+    end
   end
 end

data/app/controllers/spotlight/browse_controller.rb

@@ -1,15 +1,18 @@
 module Spotlight
+  ##
+  # Index and read actions for browse (see {Spotlight::SearchesController}
+  # for the curator's create-update-delete actions)
   class BrowseController < Spotlight::ApplicationController
-    load_and_authorize_resource :exhibit, class: "Spotlight::Exhibit"
+    load_and_authorize_resource :exhibit, class: 'Spotlight::Exhibit'
     include Spotlight::Base
     include Spotlight::Catalog::AccessControlsEnforcement
 
     load_and_authorize_resource :search, except: :index, through: :exhibit, parent: false
-    before_filter :attach_breadcrumbs
+    before_action :attach_breadcrumbs
     record_search_parameters only: :show
 
-    before_filter :set_masthead, only: :show
-    
+    before_action :set_masthead, only: :show
+
     def index
       @searches = @exhibit.searches.published
     end
@@ -18,10 +21,11 @@ module Spotlight
       blacklight_config.index.document_actions = blacklight_config.browse.document_actions
 
       add_breadcrumb @search.title, exhibit_browse_path(@exhibit, @search)
-      (@response, @document_list) = get_search_results @search.query_params.with_indifferent_access.merge(params)
+      (@response, @document_list) = search_results(@search.query_params.with_indifferent_access.merge(params), search_params_logic)
     end
-    
+
     protected
+
     ##
     # Browsing an exhibit should start a new search session
     def start_new_search_session?
@@ -31,12 +35,12 @@ module Spotlight
     # WARNING: Blacklight::Catalog::SearchContext sets @searches in history_session in a before_filter
     # See https://github.com/projectblacklight/blacklight/pull/780
     def history_session
-      #nop
+      # nop
     end
 
     def attach_breadcrumbs
       add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb (@exhibit.main_navigations.browse.label_or_default), exhibit_browse_index_path(@exhibit)
+      add_breadcrumb((@exhibit.main_navigations.browse.label_or_default), exhibit_browse_index_path(@exhibit))
     end
 
     def _prefixes
@@ -44,7 +48,7 @@ module Spotlight
     end
 
     def set_masthead
-      self.current_masthead = @search.masthead if @search.masthead and @search.masthead.display?
+      self.current_masthead = @search.masthead if @search.masthead && @search.masthead.display?
     end
   end
 end

data/app/controllers/spotlight/catalog_controller.rb

@@ -1,213 +1,231 @@
-class Spotlight::CatalogController < ::CatalogController
-  include Spotlight::Concerns::ApplicationController
-  load_and_authorize_resource :exhibit, class: Spotlight::Exhibit, prepend: true
-  include Spotlight::Catalog
-  before_filter :authenticate_user!, only: [:admin, :edit, :make_public, :make_private]
-  before_filter :check_authorization, only: [:admin, :edit, :make_public, :make_private]
-  before_filter :redirect_to_exhibit_home_without_search_params, only: :index
-  before_filter :add_breadcrumb_with_search_params, only: :index
-
-  before_filter :attach_breadcrumbs
-  
-
-  def new
-    add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
-    add_breadcrumb t(:'spotlight.curation.sidebar.items'), admin_exhibit_catalog_index_path(@exhibit)
-    add_breadcrumb t(:'spotlight.catalog.new.header'), new_exhibit_catalog_path(@exhibit)
-    @resource = @exhibit.resources.build
-  end
+module Spotlight
+  ##
+  # Spotlight's catalog controller. Note that this subclasses
+  # the host application's CatalogController to get its configuration,
+  # partial overrides, etc
+  # rubocop:disable Metrics/ClassLength
+  class CatalogController < ::CatalogController
+    include Spotlight::Concerns::ApplicationController
+    load_and_authorize_resource :exhibit, class: Spotlight::Exhibit, prepend: true
+    include Spotlight::Catalog
+    include Spotlight::Concerns::CatalogSearchContext
+
+    before_action :authenticate_user!, only: [:admin, :edit, :make_public, :make_private]
+    before_action :check_authorization, only: [:admin, :edit, :make_public, :make_private]
+    before_action :redirect_to_exhibit_home_without_search_params!, only: :index
+    before_action :add_breadcrumb_with_search_params, only: :index
+
+    before_action :attach_breadcrumbs
+
+    before_action only: :show do
+      blacklight_config.show.partials.unshift 'curation_mode_toggle'
+    end
+
+    before_action only: :admin do
+      blacklight_config.view.select! { |k, _v| k == :admin_table }
+      blacklight_config.view.admin_table.partials = [:index_compact]
+      blacklight_config.view.admin_table.document_actions = []
 
-  def show
-    blacklight_config.show.partials.unshift "curation_mode_toggle"
-    super
+      unless blacklight_config.sort_fields.key? :timestamp
+        blacklight_config.add_sort_field :timestamp, sort: "#{blacklight_config.index.timestamp_field} desc"
+      end
+    end
 
-    if @document.private? current_exhibit
-      authenticate_user!
-      authorize! :curate, current_exhibit
+    before_action only: :edit do
+      blacklight_config.view.edit.partials = blacklight_config.view_config(:show).partials.dup
+      blacklight_config.view.edit.partials.insert(2, :edit)
     end
 
-    if current_browse_category
-      add_breadcrumb current_browse_category.exhibit.main_navigations.browse.label_or_default, exhibit_browse_index_path(current_browse_category.exhibit)
-      add_breadcrumb current_browse_category.title, exhibit_browse_path(current_browse_category.exhibit, current_browse_category)
-    elsif current_page_context
-      add_breadcrumb current_page_context.title, [current_page_context.exhibit, current_page_context] if current_page_context.title.present? and !current_page_context.is_a?(Spotlight::HomePage)
-    else
-      add_breadcrumb t(:'spotlight.catalog.breadcrumb.index'), search_action_url(current_search_session[:query_params]) if current_search_session
+    def new
+      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.curation.sidebar.items'), admin_exhibit_catalog_index_path(@exhibit)
+      add_breadcrumb t(:'spotlight.catalog.new.header'), new_exhibit_catalog_path(@exhibit)
+      @resource = @exhibit.resources.build
     end
-    add_breadcrumb Array(@document[blacklight_config.view_config(:show).title_field]).join(', '), exhibit_catalog_path(@exhibit, @document)
-  end
 
-  # "id_ng" and "full_title_ng" should be defined in the Solr core's schema.xml.
-  # It's expected that these fields will be set up to have  EdgeNGram filter
-  # setup within their index analyzer. This will ensure that this method returns
-  # results when a partial match is passed in the "q" parameter.
-  def autocomplete
-    (_, @document_list) = get_search_results(params.merge(search_field: Spotlight::Engine.config.autocomplete_search_field), facet: false, "facet.field" => [], fq: ["-#{Spotlight::SolrDocument.visibility_field(current_exhibit)}:false"])
+    def show
+      super
 
-    respond_to do |format|
-      format.json do
-        render json: { docs: autocomplete_json_response(@document_list) }
+      if @document.private? current_exhibit
+        authenticate_user! && authorize!(:curate, current_exhibit)
       end
-    end
-  end
 
-  def admin
-    self.blacklight_config.view.select! { |k,v| k == :admin_table }
-    self.blacklight_config.view.admin_table.partials = [:index_compact]
-    self.blacklight_config.view.admin_table.document_actions = []
+      add_document_breadcrumbs(@document)
+    end
 
-    unless self.blacklight_config.sort_fields.has_key? :timestamp
-      self.blacklight_config.add_sort_field :timestamp, sort: "#{blacklight_config.index.timestamp_field} desc"
+    # "id_ng" and "full_title_ng" should be defined in the Solr core's schema.xml.
+    # It's expected that these fields will be set up to have  EdgeNGram filter
+    # setup within their index analyzer. This will ensure that this method returns
+    # results when a partial match is passed in the "q" parameter.
+    def autocomplete
+      search_params = params.merge(search_field: Spotlight::Engine.config.autocomplete_search_field)
+      (_, @document_list) = search_results(search_params.merge(public: true), search_params_logic)
+
+      respond_to do |format|
+        format.json do
+          render json: { docs: autocomplete_json_response(@document_list) }
+        end
+      end
     end
 
-    add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
-    add_breadcrumb t(:'spotlight.curation.sidebar.items'), admin_exhibit_catalog_index_path(@exhibit)
-    (@response, @document_list) = get_search_results
-    @filters = params[:f] || []
-      
-    respond_to do |format|
-      format.html
+    def admin
+      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.curation.sidebar.items'), admin_exhibit_catalog_index_path(@exhibit)
+      (@response, @document_list) = search_results(params, search_params_logic)
+      @filters = params[:f] || []
+
+      respond_to do |format|
+        format.html
+      end
     end
-  end
 
-  def update
-    @response, @document = fetch params[:id]
-    @document.update(current_exhibit, solr_document_params)
-    @document.save
-    repository.connection.commit rescue nil
-    redirect_to exhibit_catalog_path(current_exhibit, @document)
-  end
+    def update
+      @response, @document = fetch params[:id]
+      @document.update(current_exhibit, solr_document_params)
+      @document.save
 
-  def edit
-    @response, @document = fetch params[:id]
-    blacklight_config.view.edit.partials = blacklight_config.view_config(:show).partials.dup
-    blacklight_config.view.edit.partials.insert(2, :edit)
-  end
+      try_solr_commit!
 
-  def make_private
-    @response, @document = fetch params[:catalog_id]
-    @document.make_private!(current_exhibit)
-    @document.save
+      redirect_to exhibit_catalog_path(current_exhibit, @document)
+    end
 
-    respond_to do |format|
-      format.html { redirect_to :back }
-      format.json { render json: true }
+    def edit
+      @response, @document = fetch params[:id]
     end
-  end
 
-  def make_public
-    @response, @document = fetch params[:catalog_id]
-    @document.make_public!(current_exhibit)
-    @document.save
+    def make_private
+      @response, @document = fetch params[:catalog_id]
+      @document.make_private!(current_exhibit)
+      @document.save
 
-    respond_to do |format|
-      format.html { redirect_to :back }
-      format.json { render json: true }
+      respond_to do |format|
+        format.html { redirect_to :back }
+        format.json { render json: true }
+      end
     end
-  end
 
-  protected
+    def make_public
+      @response, @document = fetch params[:catalog_id]
+      @document.make_public!(current_exhibit)
+      @document.save
 
-  # TODO move this out of app/helpers/blacklight/catalog_helper_behavior.rb and into blacklight/catalog.rb
-  def has_search_parameters?
-    !params[:q].blank? or !params[:f].blank? or !params[:search_field].blank?
-  end
+      respond_to do |format|
+        format.html { redirect_to :back }
+        format.json { render json: true }
+      end
+    end
 
-  def attach_breadcrumbs
-    # The "q: ''" is necessary so that the breadcrumb builder recognizes that a path like this:
-    # /exhibits/1?f%5Bgenre_sim%5D%5B%5D=map&q= is not the same as /exhibits/1
-    # Otherwise the exhibit breadcrumb won't be a link.
-    # see http://api.rubyonrails.org/classes/ActionView/Helpers/UrlHelper.html#method-i-current_page-3F
-    add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), exhibit_root_path(@exhibit, q: '')
-  end
+    protected
+
+    # TODO: move this out of app/helpers/blacklight/catalog_helper_behavior.rb and into blacklight/catalog.rb
+    # rubocop:disable Style/PredicateName
+    def has_search_parameters?
+      !params[:q].blank? || !params[:f].blank? || !params[:search_field].blank?
+    end
+    # rubocop:enable Style/PredicateName
+
+    def attach_breadcrumbs
+      # The "q: ''" is necessary so that the breadcrumb builder recognizes that a path like this:
+      # /exhibits/1?f%5Bgenre_sim%5D%5B%5D=map&q= is not the same as /exhibits/1
+      # Otherwise the exhibit breadcrumb won't be a link.
+      # see http://api.rubyonrails.org/classes/ActionView/Helpers/UrlHelper.html#method-i-current_page-3F
+      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), exhibit_root_path(@exhibit, q: '')
+    end
+
+    ##
+    # Override Blacklight's #setup_next_and_previous_documents to handle
+    # browse categories too
+    def setup_next_and_previous_documents
+      if current_browse_category
+        setup_next_and_previous_documents_from_browse_category
+      elsif current_page_context
+        # TODO: figure out how to construct previous/next documents
+      else
+        super
+      end
+    end
 
-  ## 
-  # Override Blacklight's #setup_next_and_previous_documents to handle
-  # browse categories too
-  def setup_next_and_previous_documents
-    if current_browse_category
+    def setup_next_and_previous_documents_from_browse_category
       index = search_session['counter'].to_i - 1
       response, documents = get_previous_and_next_documents_for_search index, current_browse_category.query_params.with_indifferent_access
       search_session['total'] = response.total
-      @search_context_response = response
       @previous_document = documents.first
       @next_document = documents.last
-    elsif current_page_context
-      # TODO: figure out how to construct previous/next documents 
-    else
-      super
     end
-  end
 
-  def _prefixes
-    @_prefixes ||= super + ['catalog']
-  end
-
-  ##
-  # Admin catalog controller should not create a new search
-  # session in the blacklight context
-  def start_new_search_session?
-    super || params[:action] == 'admin'
-  end
+    def _prefixes
+      @_prefixes ||= super + ['catalog']
+    end
 
-  def solr_document_params
-    params.require(:solr_document).permit(:exhibit_tag_list, uploaded_resource: [:url], sidecar: [:public, data: [editable_solr_document_params] ])
-  end
+    ##
+    # Admin catalog controller should not create a new search
+    # session in the blacklight context
+    def start_new_search_session?
+      super || params[:action] == 'admin'
+    end
 
-  def editable_solr_document_params
-    custom_field_params + uploaded_resource_params
-  end
+    def solr_document_params
+      params.require(:solr_document).permit(:exhibit_tag_list,
+                                            uploaded_resource: [:url],
+                                            sidecar: [:public, data: [editable_solr_document_params]])
+    end
 
-  def uploaded_resource_params
-    if @document.uploaded_resource?
-      [{configured_fields: Spotlight::Resources::Upload.fields(current_exhibit).collect(&:field_name)}]
-    else
-      []
+    def editable_solr_document_params
+      custom_field_params + uploaded_resource_params
     end
-  end
 
-  def custom_field_params
-    current_exhibit.custom_fields.pluck(:field)
-  end
+    def uploaded_resource_params
+      if @document.uploaded_resource?
+        [{ configured_fields: Spotlight::Resources::Upload.fields(current_exhibit).map(&:field_name) }]
+      else
+        []
+      end
+    end
 
-  def check_authorization
-    authorize! :curate, @exhibit
-  end
+    def custom_field_params
+      current_exhibit.custom_fields.pluck(:field)
+    end
 
-  def current_browse_category
-    @current_browse_category ||= if current_search_session and current_search_session.query_params["action"] == "show" and current_search_session.query_params["controller"] == "spotlight/browse"
-      current_exhibit.searches.accessible_by(current_ability).find(current_search_session.query_params["id"]) if current_search_session.query_params["id"]
+    def check_authorization
+      authorize! :curate, @exhibit
     end
-  end
 
-  def redirect_to_exhibit_home_without_search_params
-    unless has_search_parameters?
-      redirect_to spotlight.exhibit_root_path(@exhibit)
+    def redirect_to_exhibit_home_without_search_params!
+      redirect_to spotlight.exhibit_root_path(@exhibit) unless has_search_parameters?
     end
-  end
 
-  def add_breadcrumb_with_search_params
-    if has_search_parameters?
-      add_breadcrumb t(:'spotlight.catalog.breadcrumb.index'), request.fullpath
+    def add_breadcrumb_with_search_params
+      add_breadcrumb t(:'spotlight.catalog.breadcrumb.index'), request.fullpath if has_search_parameters?
     end
-  end
 
-  def current_page_context
-    @current_page_context ||= if current_search_session and current_search_session.query_params["action"] == "show" and current_search_session.query_params["controller"].ends_with? "_pages"
-      if current_search_session.query_params["controller"] == "spotlight/home_pages"
-        current_exhibit.home_page if can? :read, current_exhibit.home_page
-      else
-        current_exhibit.pages.accessible_by(current_ability).find(current_search_session.query_params["id"]) if current_search_session.query_params["id"]
+    # rubocop:disable Metrics/AbcSize
+    def add_document_breadcrumbs(document)
+      if current_browse_category
+        add_breadcrumb current_browse_category.exhibit.main_navigations.browse.label_or_default, exhibit_browse_index_path(current_browse_category.exhibit)
+        add_breadcrumb current_browse_category.title, exhibit_browse_path(current_browse_category.exhibit, current_browse_category)
+      elsif current_page_context && current_page_context.title.present? && !current_page_context.is_a?(Spotlight::HomePage)
+        add_breadcrumb current_page_context.title, [current_page_context.exhibit, current_page_context]
+      elsif current_search_session
+        add_breadcrumb t(:'spotlight.catalog.breadcrumb.index'), search_action_url(current_search_session[:query_params])
       end
+
+      add_breadcrumb Array(document[blacklight_config.view_config(:show).title_field]).join(', '), exhibit_catalog_path(current_exhibit, document)
     end
-  end
+    # rubocop:enable Metrics/AbcSize
 
-  def additional_export_formats document, format
-    super
+    def additional_export_formats(document, format)
+      super
+
+      format.solr_json do
+        authorize! :update_solr, @exhibit
+        render json: document.to_solr.merge(@exhibit.solr_data)
+      end
+    end
 
-    format.solr_json do
-      authorize! :update_solr, @exhibit
-      render json: document.to_solr.merge(@exhibit.solr_data)
+    def try_solr_commit!
+      repository.connection.commit
+    rescue => e
+      Rails.logger.info "Failed to commit document updates: #{e}"
     end
   end
 end