curation_concerns 0.12.0.pre1 → 0.12.0.pre2

data/app/services/curation_concerns/file_set_audit_service.rb

@@ -0,0 +1,105 @@
+module CurationConcerns
+  class FileSetAuditService
+    attr_reader :file_set
+    def initialize(file_set)
+      @file_set = file_set
+    end
+
+    NO_RUNS = 999
+
+    # provides a human readable version of the audit status
+    # This may trigger audits to be run if required
+    # @param [Hydra::PCDM::File] file the file to get the audit status for, defaults to the original_file.
+    def human_readable_audit_status(file = file_set.original_file)
+      audit_stat(file)
+    end
+
+    # Check the file by only what is in the audit log.
+    # Do not try to access the versions if we do not have access to them.
+    # Use this when a file_set is loaded from solr instead of fedora
+    def logged_audit_status
+      audit_results = ChecksumAuditLog.logs_for(file_set.id, "original_file")
+                                      .collect { |result| result["pass"] }
+
+      if audit_results.length > 0
+        stat_to_string(audit_results.reduce(true) { |sum, value| sum && value })
+      else
+        'Audits have not yet been run on this file.'
+      end
+    end
+
+    # Audits each version of each file if it hasn't been audited recently
+    # Returns the set of most recent audit status for each version of the content file
+    # @param [Hash] log container for messages, mapping file ids to status
+    def audit(log = {})
+      file_set.files.each { |f| log[f.id] = audit_file(f) }
+      log
+    end
+
+    private
+
+      def stat_to_string(stat)
+        case stat
+        when 0
+          'failing'
+        when 1
+          'passing'
+        else
+          fail ArgumentError, "Unknown status `#{stat}'"
+        end
+      end
+
+      # Retrieve or generate the audit check for a file (all versions are checked for versioned files)
+      # @param [ActiveFedora::File] file to audit
+      # @param [Array] log container for messages
+      def audit_file(file, log = [])
+        versions = file.has_versions? ? file.versions.all : file
+        versions.each { |v| log << audit_file_version(file.id, v.uri) }
+        log
+      end
+
+      # Retrieve or generate the audit check for a file and provide a human-readable status message.
+      # @param [ActiveFedora::File] file to audit
+      def audit_stat(file)
+        audit_results = audit_file(file).collect { |result| result['pass'] }
+        # check how many non runs we had
+        non_runs = audit_results.reduce(0) { |sum, value| value == NO_RUNS ? sum + 1 : sum }
+        if non_runs == 0
+          result = audit_results.reduce(true) { |sum, value| sum && value }
+          stat_to_string(result)
+        elsif non_runs < audit_results.length
+          result = audit_results.reduce(true) { |sum, value| value == NO_RUNS ? sum : sum && value }
+          "Some audits have not been run, but the ones run were #{stat_to_string(result)}."
+        else
+          'Audits have not yet been run on this file.'
+        end
+      end
+
+      # Retrieve or generate the audit check for a specific version of a file
+      # @param [String] file_id used to find the file within its parent object (usually "original_file")
+      # @param [String] version_uri the version to be audited (or the file uri for non-versioned files)
+      def audit_file_version(file_id, version_uri)
+        latest_audit = ChecksumAuditLog.logs_for(file_set.id, file_id).first
+        return latest_audit unless needs_audit?(latest_audit)
+        AuditJob.perform_later(file_set, file_id, version_uri.to_s)
+        latest_audit || ChecksumAuditLog.new(pass: NO_RUNS, file_set_id: file_set.id, file_id: file_id, version: version_uri)
+      end
+
+      # Check if time since the last audit is greater than the maximum days allowed between audits
+      # @param [ChecksumAuditLog] latest_audit the most recent audit event
+      def needs_audit?(latest_audit)
+        return true unless latest_audit
+        unless latest_audit.updated_at
+          logger.warn "***AUDIT*** problem with audit log! Latest Audit is not nil, but updated_at is not set #{latest_audit}"
+          return true
+        end
+        days_since_last_audit(latest_audit) >= CurationConcerns.config.max_days_between_audits
+      end
+
+      # Return the number of days since the latest audit event
+      # @param [ChecksumAuditLog] latest_audit the most recent audit event
+      def days_since_last_audit(latest_audit)
+        (DateTime.now - latest_audit.updated_at.to_date).to_i
+      end
+  end
+end

data/app/services/curation_concerns/indexes_thumbnails.rb

@@ -0,0 +1,30 @@
+module CurationConcerns
+  module IndexesThumbnails
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :thumbnail_path_service
+      self.thumbnail_path_service = ThumbnailPathService
+      class_attribute :thumbnail_field
+      self.thumbnail_field = 'thumbnail_path_ss'.freeze
+    end
+
+    # Adds thumbnail indexing to the solr document
+    def generate_solr_document
+      super.tap do |solr_doc|
+        index_thumbnails(solr_doc)
+      end
+    end
+
+    # Write the thumbnail paths into the solr_document
+    # @params [Hash] solr_document the solr document to add the field to
+    def index_thumbnails(solr_document)
+      solr_document[thumbnail_field] = thumbnail_path
+    end
+
+    # Returns the value for the thumbnail path to put into the solr document
+    def thumbnail_path
+      self.class.thumbnail_path_service.call(object)
+    end
+  end
+end

data/app/services/curation_concerns/local_file_service.rb

@@ -0,0 +1,10 @@
+module CurationConcerns
+  class LocalFileService
+    # @param [String] file_name path to the file
+    # @param [Hash] _options
+    # @yield [File] opens the file and yields it to the block
+    def self.call(file_name, _options)
+      yield File.open(file_name)
+    end
+  end
+end

data/app/services/curation_concerns/lock_manager.rb

@@ -0,0 +1,39 @@
+require 'redlock'
+module CurationConcerns
+  class LockManager
+    class UnableToAcquireLockError < StandardError; end
+
+    attr_reader :client
+
+    # @param [Fixnum] time_to_live How long to hold the lock in milliseconds
+    # @param [Fixnum] retry_count How many times to retry to acquire the lock before raising UnableToAcquireLockError
+    # @param [Fixnum] retry_delay Maximum wait time in milliseconds before retrying. Wait time is a random value between 0 and retry_delay.
+    def initialize(time_to_live, retry_count, retry_delay)
+      @ttl = time_to_live
+      @client = Redlock::Client.new([uri], retry_count: retry_count, retry_delay: retry_delay)
+    end
+
+    # Blocks until lock is acquired or timeout.
+    def lock(key)
+      returned_from_block = nil
+      client.lock(key, @ttl) do |locked|
+        raise UnableToAcquireLockError unless locked
+        returned_from_block = yield
+      end
+      returned_from_block
+    end
+
+    private
+
+      def uri
+        @uri ||= begin
+          opts = options
+          URI("#{opts[:scheme]}://#{opts[:host]}:#{opts[:port]}").to_s
+        end
+      end
+
+      def options
+        ::Resque.redis.redis.client.options
+      end
+  end
+end

data/app/services/curation_concerns/lockable.rb

@@ -0,0 +1,16 @@
+module CurationConcerns
+  module Lockable
+    extend ActiveSupport::Concern
+
+    def acquire_lock_for(lock_key, &block)
+      lock_manager.lock(lock_key, &block)
+    end
+
+    def lock_manager
+      @lock_manager ||= CurationConcerns::LockManager.new(
+        CurationConcerns.config.lock_time_to_live,
+        CurationConcerns.config.lock_retry_count,
+        CurationConcerns.config.lock_retry_delay)
+    end
+  end
+end

data/app/services/curation_concerns/noid.rb

@@ -0,0 +1,23 @@
+require 'active_fedora/noid'
+
+module CurationConcerns
+  module Noid
+    extend ActiveSupport::Concern
+
+    ## This overrides the default behavior, which is to ask Fedora for an id
+    # @see ActiveFedora::Persistence.assign_id
+    def assign_id
+      service.mint if CurationConcerns.config.enable_noids
+    end
+
+    def to_param
+      id
+    end
+
+    private
+
+      def service
+        @service ||= ActiveFedora::Noid::Service.new
+      end
+  end
+end

data/app/services/curation_concerns/persist_derivatives.rb

@@ -0,0 +1,33 @@
+module CurationConcerns
+  class PersistDerivatives < Hydra::Derivatives::PersistOutputFileService
+    # Persists a derivative to the local file system.
+    # This Service conforms to the signature of `Hydra::Derivatives::PersistOutputFileService`.
+    # This service is an alternative to the default Hydra::Derivatives::PersistOutputFileService.
+    # This service will always update existing and does not do versioning of persisted files.
+    #
+    # @param [#read] stream the derivative filestream
+    # @param [Hash] directives
+    # @option directives [String] :url a url to the file destination
+    def self.call(stream, directives)
+      output_file(directives) do |output|
+        IO.copy_stream(stream, output)
+      end
+    end
+
+    # Open the output file to write and yield the block to the
+    # file. It makes the directories in the path if necessary.
+    def self.output_file(directives, &blk)
+      # name = derivative_path_factory.derivative_path_for_reference(object, destination_name)
+      raise ArgumentError, "No :url was provided in the transcoding directives" unless directives.key?(:url)
+      uri = URI(directives.fetch(:url))
+      raise ArgumentError, "Must provide a file uri" unless uri.scheme == 'file'
+      output_file_dir = File.dirname(uri.path)
+      FileUtils.mkdir_p(output_file_dir) unless File.directory?(output_file_dir)
+      File.open(uri.path, 'wb', &blk)
+    end
+
+    def self.derivative_path_factory
+      DerivativePath
+    end
+  end
+end

data/app/services/curation_concerns/persist_directly_contained_output_file_service.rb

@@ -0,0 +1,26 @@
+module CurationConcerns
+  # This Service is an implementation of the Hydra::Derivatives::PersistOutputFileService
+  # It supports directly contained files
+  class PersistDirectlyContainedOutputFileService < Hydra::Derivatives::PersistBasicContainedOutputFileService
+    # This method conforms to the signature of the .call method on Hydra::Derivatives::PersistOutputFileService
+    # * Persists the file within the DirectContainer specified by :container
+    #
+    # @param [#read] stream the data to be persisted
+    # @param [Hash] directives directions which can be used to determine where to persist to.
+    # @option directives [String] url URI for the parent object.
+    # @option directives [String] container Name of the container association.
+    def self.call(stream, directives)
+      file = Hydra::Derivatives::IoDecorator.new(stream, new_mime_type(directives.fetch(:format)))
+      o_name = determine_original_name(file)
+      m_type = determine_mime_type(file)
+      uri = URI(directives.fetch(:url))
+      raise ArgumentError, "#{uri} is not an http uri" unless uri.scheme == 'http'
+      file_set = ActiveFedora::Base.find(ActiveFedora::Base.uri_to_id(uri.to_s))
+      remote_file = file_set.send("build_#{directives.fetch(:container)}".to_sym)
+      remote_file.content = file
+      remote_file.mime_type = m_type
+      remote_file.original_name = o_name
+      file_set.save
+    end
+  end
+end

data/app/services/curation_concerns/repository_audit_service.rb

@@ -0,0 +1,7 @@
+module CurationConcerns
+  class RepositoryAuditService
+    def self.audit_everything
+      ::FileSet.find_each(&:audit)
+    end
+  end
+end

data/app/services/curation_concerns/thumbnail_path_service.rb

@@ -0,0 +1,46 @@
+module CurationConcerns
+  class ThumbnailPathService
+    class << self
+      # @param [Work, FileSet] the object to get the thumbnail for
+      # @return [String] a path to the thumbnail
+      def call(object)
+        return default_image unless object.thumbnail_id
+
+        thumb = fetch_thumbnail(object)
+        return unless thumb
+        if thumb.audio?
+          audio_image
+        elsif thumbnail?(thumb)
+          Rails.application.routes.url_helpers.download_path(object.thumbnail_id, file: 'thumbnail')
+        else
+          default_image
+        end
+      end
+
+      def fetch_thumbnail(object)
+        return object if object.thumbnail_id == object.id
+        ::FileSet.load_instance_from_solr(object.thumbnail_id)
+      rescue ActiveFedora::ObjectNotFoundError
+        Rails.logger.error("Couldn't find thumbnail #{object.thumbnail_id} for #{object.id}")
+        nil
+      end
+
+      def default_image
+        ActionController::Base.helpers.image_path 'default.png'
+      end
+
+      def audio_image
+        ActionController::Base.helpers.image_path 'audio.png'
+      end
+
+      # @return true if there a file on disk for this object, otherwise false
+      def thumbnail?(thumb)
+        File.exist?(thumbnail_filepath(thumb))
+      end
+
+      def thumbnail_filepath(thumb)
+        CurationConcerns::DerivativePath.derivative_path_for_reference(thumb, 'thumbnail')
+      end
+    end
+  end
+end

data/app/services/curation_concerns/time_service.rb

@@ -0,0 +1,7 @@
+module CurationConcerns
+  class TimeService
+    def self.time_in_utc
+      DateTime.now.utc
+    end
+  end
+end

data/app/services/curation_concerns/versioning_service.rb

@@ -0,0 +1,26 @@
+module CurationConcerns
+  class VersioningService
+    # Make a version and record the version committer
+    # @param [ActiveFedora::File] content
+    # @param [User, String] user
+    def self.create(content, user = nil)
+      content.create_version
+      record_committer(content, user) if user
+    end
+
+    # @param [ActiveFedora::File] file
+    def self.latest_version_of(file)
+      file.versions.last
+    end
+
+    # Record the version committer of the last version
+    # @param [ActiveFedora::File] content
+    # @param [User, String] user_key
+    def self.record_committer(content, user_key)
+      user_key = user_key.user_key if user_key.respond_to?(:user_key)
+      version = latest_version_of(content)
+      return if version.nil?
+      VersionCommitter.create(version_id: version.uri, committer_login: user_key)
+    end
+  end
+end

data/app/validators/has_one_title_validator.rb

@@ -0,0 +1,8 @@
+# validates that the title has at least one title
+class HasOneTitleValidator < ActiveModel::Validator
+  def validate(record)
+    if record.title.reject(&:empty?).empty?
+      record.errors[:title] << "You must provide a title"
+    end
+  end
+end

data/app/views/batch_select/_add_button.html.erb

@@ -0,0 +1,3 @@
+<div data-behavior="batch-add-button">
+  <%= check_box_tag "batch_document_ids[]", document.id, false, class:"batch_document_selector", id: "batch_document_#{document.id}" %>
+</div>

data/app/views/batch_select/_check_all.html.erb

@@ -0,0 +1,4 @@
+<%= form_tag(all_batch_edits_path, :method => :put, :class=> "batch-select-all hidden", "data-behavior" => 'batch-select-all') do -%>
+  <%= submit_tag(label, :class=>'batch-all-button btn') %>
+<% end %>
+

data/app/views/batch_select/_tools.html.erb

@@ -0,0 +1,10 @@
+  <div class="btn-group batch-tools hidden" data-behavior="batch-tools">
+    <button class="btn"><i class="icon-cog"></i> Tools</button>
+    <button class="btn dropdown-toggle" data-toggle="dropdown">
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu">
+      <li data-behavior="batch-edit-activate" data-state="<%= batch_edit_state %>"><a href="#"><i class=""></i> Batch edit</a></li>
+    </ul>
+  </div>
+

data/app/views/catalog/_action_menu_partials/_collection.html.erb

@@ -3,15 +3,15 @@
   <ul class="dropdown-menu">
     <% if can? :edit, document %>
       <li>
-        <%= link_to [collections, :edit, document], class: 'itemicon itemedit' do %><i class="glyphicon glyphicon-pencil"></i> Edit <%= document.human_readable_type %>
+        <%= link_to [:edit, document], class: 'itemicon itemedit' do %><i class="glyphicon glyphicon-pencil"></i> Edit <%= document.human_readable_type %>
         <% end %>
       </li>
       <li>
         <% if @collection # We're on the view page for @collection. -%>
           <%= button_for_remove_from_collection(document) %>
         <% else %>
-          <%= link_to [collections, document], class: 'itemicon itemtrash', title: 'Delete Collection', method: :delete, data: {
-                          confirm: "Deleting a collection from #{t('curation_concerns.product_name')} is permanent. Click OK to delete this collection from #{t('curation_concerns.product_name')}, or Cancel to cancel this operation" } do %>
+          <%= link_to document, class: 'itemicon itemtrash', title: 'Delete Collection', method: :delete, data: {
+                          confirm: "Deleting a collection from #{application_name} is permanent. Click OK to delete this collection from #{application_name}, or Cancel to cancel this operation" } do %>
                           <i class="glyphicon glyphicon-trash"></i> Delete <%= document.human_readable_type %>
           <% end %>
         <% end %>

data/app/views/catalog/_action_menu_partials/_default.html.erb

@@ -14,7 +14,7 @@
             <%= link_to document, class: 'itemicon itemtrash',
                         title: "Delete #{document.human_readable_type}", method: :delete,
                         data: {
-                          confirm: "Deleting a #{document.human_readable_type} from #{t('curation_concerns.product_name')} is permanent. Click OK to delete this #{document.human_readable_type} from #{t('curation_concerns.product_name')}, or Cancel to cancel this operation" } do %>
+                          confirm: "Deleting a #{document.human_readable_type} from #{application_name} is permanent. Click OK to delete this #{document.human_readable_type} from #{application_name}, or Cancel to cancel this operation" } do %>
                             <i class="glyphicon glyphicon-trash"></i> Delete <%= document.human_readable_type %>
             <% end %>
           <% end %>

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

@@ -1,4 +1,4 @@
-<h3 id="document-list-heading" class="sr-only">List of items deposited in <%= t('curation_concerns.product_name') %> that match your search criteria</h3>
+<h3 id="document-list-heading" class="sr-only">List of items deposited in <%= application_name %> that match your search criteria</h3>
 <ol id="documents" class="container-fluid search-results-list" start="<%= document_counter_with_offset(0) %>" aria-labeled-by="document-list-heading">
   <%= render documents, as: :document %>
 </ol>

data/app/views/collections/_bookmark_control.html.erb

@@ -0,0 +1,2 @@
+<%= render 'catalog/bookmark_control', document: document %>
+

data/app/views/collections/_button_create_collection.html.erb

@@ -0,0 +1,2 @@
+<%= button_to label, new_collection_path, :method=>:get, :class=>"btn btn-primary collection-add submits-batches", 'data-behavior'=>'hydra-collections', :id=>'hydra-collection-add' %>
+

data/app/views/collections/_button_for_creating_empty_collection.html.erb

@@ -1,3 +1,3 @@
 <div class="collection-empty">
-  <%= button_to label, collections.new_collection_path, method: :get, class: "btn btn-primary collection-add collection-empty", 'data-behavior'=>'hydra-collections', id: 'hydra-collection-add' %>
+  <%= button_to label, new_collection_path, method: :get, class: "btn btn-primary collection-add collection-empty", 'data-behavior'=>'hydra-collections', id: 'hydra-collection-add' %>
 </div>

data/app/views/collections/_button_for_delete_collection.html.erb

@@ -0,0 +1,4 @@
+<%# button for deleting a collections %>
+<%# collection -- collection to be deleted %>
+<%= button_to label, collection_path(collection.id), data:{confirm: confirm, behavior: 'hydra-collections'}, method: :delete, class: "btn btn-primary collection-delete", id: 'hydra-collection-add' %>
+

data/app/views/collections/_button_for_remove_selected_from_collection.html.erb

@@ -0,0 +1,8 @@
+<%# button for removing a batch from a collection %>
+<%# collection -- collection to be updated  %>
+<%# label -- button label %>
+<%= form_for collection, url:collection_path(collection.id), :method=>:put do |f| %>
+    <%= f.hidden_field :members, :value => "remove" %>
+    <%= f.submit label, :class => "btn btn-primary collection-remove-selected submits-batches" %>
+<% end %>
+

data/app/views/collections/_button_for_update_collection.html.erb

@@ -0,0 +1,4 @@
+<%# button for updating a collections %>
+<%# collection_id -- collection to be updated (use 'collection_replace_id' if you wish the form to be updated by a form value) %>
+<%# label -- button label %>
+<%= button_to label, collection_path(collection_id), :method=>:put, :class=>"btn btn-primary updates-collection submits-batches collection-update", 'data-behavior'=>'hydra-collections', :id=>'hydra-collection-update' %>

data/app/views/collections/_button_remove_from_collection.html.erb

@@ -0,0 +1,4 @@
+<%= form_for collection, url: collection_path(collection), method: :put, as: 'collection' do |f| %>
+  <%= single_item_action_remove_form_fields(f, document) %>
+  <%= f.submit label, class: "btn btn-primary collection-remove" %>
+<% end %>

data/app/views/collections/_document_header.html.erb

@@ -0,0 +1,9 @@
+      <% # header bar for doc items in index view -%>
+      <div class="documentHeader clearfix">
+        <% # main title container for doc partial view -%>
+          <h5 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field(document), :counter => (document_counter + 1 + @response.params[:start].to_i) %></h5>
+
+        <div class="documentFunctions span2">
+          <%= button_for_remove_from_collection(@collection, document) %>
+        </div>
+      </div>

data/app/views/collections/_edit_actions.html.erb

@@ -1,5 +1,5 @@
 <h2 class="non lower">Actions</h2>
 <p>
-  <%= link_to "Go to Browse View", collections.collection_path %>  &nbsp;&nbsp;
+  <%= link_to "Go to Browse View", collection_path %>  &nbsp;&nbsp;
   <%= link_to "Add files from your dashboard",  search_path_for_my_works %>
 </p>

data/app/views/collections/_edit_descriptions.html.erb

@@ -1,6 +1,6 @@
 <%# This mimics the file_sets/descriptions partial & re-uses some of its sub-partials %>
 <div id="descriptions_display" class="tab-pane active">
-  <%= form_for collection, url: collections.collection_path, html: {multipart: true, class: 'form-horizontal'} do |f| %>
+  <%= form_for collection, url: collection_path, html: {multipart: true, class: 'form-horizontal'} do |f| %>
     <%= hidden_field_tag('redirect_tab', 'descriptions') %>
     <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
       <div class="well">

data/app/views/collections/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for [collections, @form] do |f| %>
+<%= simple_form_for @form do |f| %>
 
   <% if f.error_notification %>
     <div class="alert alert-danger fade in">
@@ -15,7 +15,7 @@
     <div class="col-md-12 form-actions">
       <%= f.submit class: 'btn btn-primary require-contributor-agreement' %>
       <% if @form.persisted? %>
-        <%= link_to 'Cancel', collections.collection_path(@form), class: 'btn btn-link' %>
+        <%= link_to 'Cancel', collection_path(@form), class: 'btn btn-link' %>
       <% else %>
         <%= link_to 'Cancel', main_app.root_path, class: 'btn btn-link' %>
       <% end %>

data/app/views/collections/_form_for_select_destination_collection.html.erb

@@ -0,0 +1,21 @@
+<% if user_collections.nil?%>
+<b>  Make sure you have included CurationConcerns::SelectsCollections in your controller for this page and 
+  added a before filter with one of the find_collections variations depending on your access level: find_collections, find_collections_with_read_access, find_collections_with_edit_access
+</b> 
+<% elsif user_collections.blank? %>
+<b> You do not have access to any existing collections please create a collection. </b>  
+<% else %>
+  Please Select your collection to add you files to:
+  <%= form_tag(collection_path(@collection), :method => "put") do %>
+    <input type="hidden" name="test" value="val" />
+    <%= hash_as_hidden_fields({:collection =>{members:"move"}}) %>
+    <div class="collection-list">
+      <ul>
+      <% user_collections.each do |collection| %>
+        <li> <%= radio_button_tag(:destination_collection_id, collection.id, false, :class => "collection-selector") %><%= label_tag(:collection, collection.title) %> </li>
+      <% end %>
+      </ul>
+    </div>
+    <%= button_to "Move to Selected Collection", collections_path, :method=>:put, :class=>"btn btn-primary collection-update submits-batches", 'data-behavior'=>'hydra-collections', :id=>'hydra-collection-move' %>
+  <% end %>
+<% end %>

data/app/views/collections/_form_to_add_member.html.erb

@@ -1,7 +1,7 @@
 <% fieldset_class  ||= '' %>
 <% select_label_id ||= '' %>
 
-<%= form_tag collections.collections_path, method: :put do %>
+<%= form_tag main_app.collections_path, method: :put do %>
   <fieldset class="required <%= fieldset_class %>">
     <%= hidden_field_tag 'collection[members]', 'add' %>
     <%= hidden_field_tag 'batch_document_ids[]', collectible.id %>

data/app/views/collections/_index_default.html.erb

@@ -0,0 +1,2 @@
+<%= render 'catalog/index_default', document: document, document_counter: document_counter %>
+

data/app/views/collections/_index_header_default.html.erb

@@ -0,0 +1,2 @@
+<%= render 'catalog/index_header_default', document: document, document_counter: document_counter %>
+

data/app/views/collections/_media_display.html.erb

@@ -1 +1 @@
-<a href="<%= collections.collection_path %>" target="_new"><img src="Other.png" alt="No preview available" width="338" /></a>
+<a href="<%= collection_path %>" target="_new"><img src="Other.png" alt="No preview available" width="338" /></a>

data/app/views/collections/_paginate.html.erb

@@ -1,6 +1,6 @@
 <% if @response.total_pages > 1 %>
     <div class="pager">
-      <%= paginate @response, outer_window: 2, theme: 'blacklight', route_set: collections %>
+      <%= paginate @response, outer_window: 2, theme: 'blacklight' %>
       <div class="clearfix"></div>
     </div><!-- /pager -->
 <% end %>

data/app/views/collections/_paginate_compact.html.erb

@@ -0,0 +1 @@
+<%= paginate paginate_compact, page_entries_info: page_entries_info(paginate_compact), theme: :blacklight_compact %>

data/app/views/collections/_results_pagination.html.erb

@@ -0,0 +1,9 @@
+<% if show_pagination? and @response.total_pages > 1 %>
+ <div class="row record-padding">
+  <div class="col-md-9"> 
+    <div class="pagination">
+      <%= paginate @response, :outer_window => 2, :theme => 'blacklight' %>
+    </div>
+  </div>
+ </div>
+<% end %>

data/app/views/collections/_search_collection_dashboard_form.html.erb

@@ -1,5 +1,5 @@
 <div class="col-md-3 pull-right">
-  <%= form_for([collections, @collection], url: collections.edit_collection_path , method: :get, class: "well form-search") do |f| %>
+  <%= form_for @collection, url: edit_collection_path, method: :get, class: "well form-search" do |f| %>
 
       <label class="sr-only">Search Collection <%= @collection.title %></label>
       <div class="input-group">

data/app/views/collections/_search_form.html.erb

@@ -1,5 +1,5 @@
 <div class="col-md-3 pull-right">
-  <%= form_for [collections, @presenter], method: :get, class: "well form-search" do |f| %>
+  <%= form_for @presenter, method: :get, class: "well form-search" do |f| %>
 
       <label class="sr-only">Search Collection <%= @presenter.title %></label>
       <div class="input-group">