hyrax 4.0.0.beta1 → 4.0.0.rc1

data/app/services/hyrax/work_resource_query_service.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+module Hyrax
+  # Responsible for retrieving information based on the given work.
+  #
+  # @see ProxyDepositRequest
+  # @see SolrDocument
+  # @see Hyrax::SolrService
+  # @note This was extracted from the ProxyDepositRequest, which was coordinating lots of effort. It was also an ActiveRecord object that required lots of Fedora/Solr interactions.
+  class WorkResourceQueryService
+    # @param [String] id - The id of the work
+    def initialize(id:)
+      @id = id
+    end
+    attr_reader :id
+
+    # @return [Boolean] if the work has been deleted
+    def deleted_work?
+      Hyrax.query_service.find_by(id: id)
+      false
+    rescue Valkyrie::Persistence::ObjectNotFoundError
+      true
+    end
+
+    def work
+      # Need to ensure it is a work?
+      resource = Hyrax.query_service.find_by(id: id)
+      raise ModelMismatchError, "Expected work but got #{resource.class}" unless resource.work?
+      resource
+    end
+
+    def to_s
+      if deleted_work?
+        'work not found'
+      else
+        solr_doc.to_s
+      end
+    end
+
+    private
+
+    def solr_doc
+      @solr_doc ||= ::SolrDocument.new(Hyrax::SolrService.search_by_id(id))
+    end
+  end
+end

data/app/services/hyrax/workflow/action_taken_service.rb

@@ -35,12 +35,12 @@ module Hyrax
         return unless action.triggered_methods.any?
         success = action.triggered_methods.order(:weight).all? do |method|
           status = process_action(method.service_name)
-          Rails.logger.debug("Result of #{method.service_name} is #{status}")
+          Hyrax.logger.debug("Result of #{method.service_name} is #{status}")
           status
         end
 
         return save_target if success
-        Rails.logger.error "Not all workflow methods were successful, so not saving (#{target.id})"
+        Hyrax.logger.error "Not all workflow methods were successful, so not saving (#{target.id})"
         false
       end
 
@@ -63,11 +63,11 @@ module Hyrax
         klass = begin
                   class_name.constantize
                 rescue NameError
-                  Rails.logger.error "Unable to find '#{class_name}', so not running workflow callback"
+                  Hyrax.logger.error "Unable to find '#{class_name}', so not running workflow callback"
                   return nil
                 end
         return klass if klass.respond_to?(:call)
-        Rails.logger.error "Expected '#{class_name}' to respond to 'call', but it didn't, so not running workflow callback"
+        Hyrax.logger.error "Expected '#{class_name}' to respond to 'call', but it didn't, so not running workflow callback"
         nil
       end
 

data/app/services/hyrax/workflow/notification_service.rb

@@ -60,11 +60,11 @@ module Hyrax
         klass = begin
                   class_name.constantize
                 rescue NameError
-                  Rails.logger.error "Unable to find '#{class_name}', so not sending notification"
+                  Hyrax.logger.error "Unable to find '#{class_name}', so not sending notification"
                   return nil
                 end
         return klass if klass.respond_to?(:send_notification)
-        Rails.logger.error "Expected '#{class_name}' to respond to 'send_notification', but it didn't, so not sending notification"
+        Hyrax.logger.error "Expected '#{class_name}' to respond to 'send_notification', but it didn't, so not sending notification"
         nil
       end
     end

data/app/services/hyrax/workflow/status_list_service.rb

@@ -69,7 +69,7 @@ module Hyrax
         actionable_roles = roles_for_user
         Hyrax.logger.debug("Actionable roles for #{@user.user_key} are #{actionable_roles}")
         return [] if actionable_roles.empty?
-        WorkRelation.new.search_with_conditions(query(actionable_roles), method: :post)
+        WorkRelation.new.search_with_conditions(query(actionable_roles), method: Hyrax.config.solr_default_method)
       end
 
       def query(actionable_roles)

data/app/services/hyrax/workflow/workflow_importer.rb

@@ -7,7 +7,7 @@ module Hyrax
     # @see .generate_from_json_file
     class WorkflowImporter
       class_attribute :default_logger
-      self.default_logger = Rails.logger
+      self.default_logger = Hyrax.logger
       class_attribute :path_to_workflow_files
       self.path_to_workflow_files = Rails.root.join('config', 'workflows', '*.json')
 
@@ -132,7 +132,7 @@ module Hyrax
         rescue InvalidStateRemovalException => e
           e.states.each do |state|
             error = I18n.t('hyrax.workflow.load.state_error', workflow_name: state.workflow.name, state_name: state.name, entity_count: state.entities.count)
-            Rails.logger.error(error)
+            Hyrax.logger.error(error)
             errors << error
           end
           Sipity::Workflow.find_by(name: configuration[:name])

data/app/services/hyrax/working_directory.rb

@@ -16,7 +16,7 @@ module Hyrax
         repository_file = Hydra::PCDM::File.find(repository_file_id)
         working_path = full_filename(id, repository_file.original_name)
         if File.exist?(working_path)
-          Rails.logger.debug "#{repository_file.original_name} already exists in the working directory at #{working_path}"
+          Hyrax.logger.debug "#{repository_file.original_name} already exists in the working directory at #{working_path}"
           return working_path
         end
         copy_repository_resource_to_working_directory(repository_file, id)
@@ -26,7 +26,7 @@ module Hyrax
       # @param [String] id the identifier of the FileSet
       # @return [String] path of the working file
       def copy_repository_resource_to_working_directory(file, id)
-        Rails.logger.debug "Loading #{file.original_name} (#{file.id}) from the repository to the working directory"
+        Hyrax.logger.debug "Loading #{file.original_name} (#{file.id}) from the repository to the working directory"
         copy_stream_to_working_directory(id, file.original_name, StringIO.new(file.content))
       end
 
@@ -38,7 +38,7 @@ module Hyrax
       # @return [String] path of the working file
       def copy_stream_to_working_directory(id, name, stream)
         working_path = full_filename(id, name)
-        Rails.logger.debug "Writing #{name} to the working directory at #{working_path}"
+        Hyrax.logger.debug "Writing #{name} to the working directory at #{working_path}"
         FileUtils.mkdir_p(File.dirname(working_path))
         IO.copy_stream(stream, working_path)
         working_path

data/app/services/hyrax/works/migration_service.rb

@@ -10,13 +10,13 @@ module Hyrax
       #   and the original data cleaned up.
       def self.migrate_predicate(predicate_from, predicate_to, works_to_update = ActiveFedora::Base.all)
         migrated = 0
-        Rails.logger.info "*** Migrating #{predicate_from} to #{predicate_to} in #{works_to_update.count} works"
+        Hyrax.logger.info "*** Migrating #{predicate_from} to #{predicate_to} in #{works_to_update.count} works"
         works_to_update.each do |work|
           next unless work.ldp_source.content.include?(predicate_from.to_s)
           migrate_data(predicate_from, predicate_to, work)
           migrated += 1
         end
-        Rails.logger.info "--- Migration Complete (#{migrated} migrated)"
+        Hyrax.logger.info "--- Migration Complete (#{migrated} migrated)"
       end
 
       # @api private
@@ -27,7 +27,7 @@ module Hyrax
         orm.value(predicate_from).each { |val| orm.graph.insert([orm.resource.subject_uri, predicate_to, val.to_s]) }
         orm.graph.delete([orm.resource.subject_uri, predicate_from, nil])
         orm.save
-        Rails.logger.info " Data migrated from #{predicate_from} to #{predicate_to} - id: #{work.id}"
+        Hyrax.logger.info " Data migrated from #{predicate_from} to #{predicate_to} - id: #{work.id}"
       end
     end
   end

data/app/utils/hyrax/test_data_seeders/user_seeder.rb

@@ -25,14 +25,14 @@ module Hyrax
         private
 
         def admin_role
-          unless defined? Role
+          unless ::User.reflect_on_association(:roles)
             logger.warn("Cannot create `Role` because the `hyrda-role-management` gem, or " \
                         "other gem providing a definition for a Role class, is not installed.  " \
                         "For development, you can edit `config/role_map.yml` and add the user's " \
                         "email under the role you want to assign.")
             return
           end
-          @admin_role ||= Role.find_by(name: Hyrax.config.admin_user_group_name)
+          @admin_role ||= Role.find_or_create_by(name: Hyrax.config.admin_user_group_name)
         end
 
         def add_user(email, password, role = nil)
@@ -43,6 +43,7 @@ module Hyrax
           end
           logger.info("   #{email} -- #{created ? 'CREATED' : 'ALREADY EXISTS'}")
           return unless role && !user.roles.include?(role)
+          logger.info("Adding #{role.name} to #{user.email}")
           user.roles << role
           user.save
         end

data/app/validators/hyrax/collection_membership_validator.rb

@@ -16,8 +16,8 @@ module Hyrax
       checker = @multiple_membership_checker.new(item: nil)
       ids = collections_ids(record)
 
-      errors = Array(checker.check(collection_ids: ids))
-      record.errors[:member_of_collection_ids].concat(errors)
+      error = checker.check(collection_ids: ids)
+      record.errors.add(:member_of_collection_ids, error) if error
     end
 
     private

data/app/views/hyrax/admin/analytics/work_reports/show.html.erb

@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-sm-12">
     <div class="work-reports">
-    
+
       <div class="card">
         <div class="card-header">
           <div class="col-sm-10">
@@ -23,7 +23,7 @@
         <div class="card-body">
           <div class="row">
             <div class="col-12 col-md-5">
-              <p><%= t('.deposited_by') %> <b><%= @document.depositor %></b> on <b><%= @document.date_uploaded.strftime("%Y-%m-%d") %></b></p>
+              <p><%= t('.deposited_by') %> <b><%= @document.depositor %></b> on <b><%= cast_to_date_time_format(@document.date_uploaded, format: "%Y-%m-%d") %></b></p>
               <p><%= t('.work_type') %> <b><%= @document.human_readable_type %></b></p>
               <p><%= t('.resource_type') %> <b><%= @document.resource_type.join(", ") %></b></p>
             </div>
@@ -34,7 +34,7 @@
           </div>
         </div>
       </div>
-          
+
       <div class="row text-center">
         <div class="nav nav-pills btn-group" role="group">
             <% if params[:start_date] %>
@@ -69,7 +69,7 @@
             <div class="tab-pane" id="monthly">
               <%= render "monthly_summary" %>
             </div>
-            
+
           <% if params[:start_date] %>
             <div class="tab-pane active" id="custom-range">
           <% else %>
@@ -79,12 +79,12 @@
               <%= render "custom_range" %>
             </div>
         </div>
-         
+
           <% unless @files.nil? %>
             <%= render "work_files" %>
             <%= render "work_counts" %>
          <% end %>
-         
+
     </div>
   </div>
 </div>

data/app/views/hyrax/base/_attribute_rows.html.erb

@@ -1,9 +1,11 @@
+<%= presenter.attribute_to_html(:alternative_title, html_dl: true) %>
 <%= presenter.attribute_to_html(:abstract, html_dl: true) %>
 <%= presenter.attribute_to_html(:date_modified, label: t('hyrax.base.show.last_modified'), html_dl: true) %>
 <%= presenter.attribute_to_html(:creator, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:contributor, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:subject, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:publisher, render_as: :faceted, html_dl: true) %>
+<%= presenter.attribute_to_html(:bibliographic_citation, html_dl: true) %>
 <%= presenter.attribute_to_html(:language, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:identifier, render_as: :linked, search_field: 'identifier_tesim', html_dl: true) %>
 <%= presenter.attribute_to_html(:keyword, render_as: :faceted, html_dl: true) %>

data/app/views/hyrax/base/_form_collections_error.html.erb

@@ -1 +1 @@
-<%= f.full_error(:collections) %>
+<%= full_collections_errors(form: f) %>

data/app/views/hyrax/base/_form_in_works_error.html.erb

@@ -1,3 +1,3 @@
-<% unless f.object.model.errors[:in_works_ids].empty? %>
+<% unless in_works_ids_errors_for(form: f.object).empty? %>
   <%= f.full_error(:in_works_ids) %>
 <% end %>

data/app/views/hyrax/base/_form_ordered_members_error.html.erb

@@ -1,3 +1,3 @@
-<% unless f.object.model.errors[:ordered_member_ids].empty? %>
+<% unless ordered_member_ids_errors_for(form: f.object).empty? %>
   <%= f.full_error(:ordered_member_ids) %>
 <% end %>

data/app/views/hyrax/base/_form_progress.html.erb

@@ -19,7 +19,7 @@
     </div>
 
     <div class="set-access-controls list-group-item">
-      <%= render 'form_visibility_component', f: f %>
+      <%= render 'form_visibility_component', f: f, save_work: true %>
     </div>
     <% if Flipflop.proxy_deposit? && current_user.can_make_deposits_for.any? %>
         <div class="list-group-item">

data/app/views/hyrax/base/_form_visibility_component.html.erb

@@ -4,7 +4,11 @@
   <%= render 'form_permission_under_lease', f: f %>
 <% else %>
     <fieldset>
-      <legend class="legend-save-work"><%= t('.visibility') %></legend>
+      <% if local_assigns[:save_work] %>
+        <legend class="legend-save-work"><%= t('.visibility') %></legend>
+      <% else %>
+        <legend><%= t('.visibility') %><%= raw(t('.subtitle_html')) %></legend>
+      <% end %>
       <ul class="visibility">
         <li class="form-check">
           <label class="form-check-label">

data/app/views/hyrax/base/_form_visibility_error.html.erb

@@ -1,5 +1,19 @@
-<%= f.full_error(:visibility) %>
-<%= f.full_error(:embargo_release_date) %>
-<%= f.full_error(:visibility_after_embargo) %>
-<%= f.full_error(:lease_expiration_date) %>
-<%= f.full_error(:visibility_after_lease) %>
+<% unless visibility_errors_for(form: f.object).empty? %>
+  <%= f.full_error(:visibility) %>
+<% end %>
+
+<% unless embargo_release_date_errors_for(form: f.object).empty? %>
+  <%= f.full_error(:embargo_release_date) %>
+<% end %>
+
+<% unless visibility_after_embargo_errors_for(form: f.object).empty? %>
+  <%= f.full_error(:visibility_after_embargo) %>
+<% end %>
+
+<% unless lease_expiration_date_errors_for(form: f.object).empty? %>
+  <%= f.full_error(:lease_expiration_date) %>
+<% end %>
+
+<% unless visibility_after_lease_errors_for(form: f.object).empty? %>
+  <%= f.full_error(:visibility_after_lease) %>
+<% end %>

data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb

@@ -14,7 +14,7 @@
                 <p><%= t("hyrax.collection.select_form.select_heading") %></p>
               
                 <% if @add_works_to_collection.present? %>
-                  <%= text_field_tag 'member_of_collection_label', @add_works_to_collection_label, size: '90', disabled: true %>
+                  <%= text_field_tag 'member_of_collection_label', @add_works_to_collection_label, disabled: true %>
                   <%= hidden_field_tag 'member_of_collection_ids', @add_works_to_collection %>
                 <% else %>
                   <%= text_field_tag 'member_of_collection_ids', nil,

data/app/views/hyrax/embargoes/edit.html.erb

@@ -13,7 +13,7 @@
       <fieldset class="set-access-controls">
         <section class="form-text">
           <p>
-            <% if curation_concern.embargo_release_date %>
+            <% if embargo_enforced?(curation_concern) %>
               <%= t('.embargo_true_html',  cc: cc_type) %>
             <% else %>
               <%= t('.embargo_false_html', cc: cc_type) %>
@@ -29,7 +29,7 @@
 
       <div class="row">
         <div class="col-md-12 form-actions">
-          <% if curation_concern.embargo_release_date %>
+          <% if embargo_enforced?(curation_concern) %>
             <%= f.submit t('.embargo_update'), class: 'btn btn-primary' %>
             <%= link_to t('.embargo_deactivate'), embargo_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
           <% else %>
@@ -48,10 +48,10 @@
     <h2 class="card-title"><%= t('.header.past') %></h2>
   </div>
   <div class="card-body">
-    <% if curation_concern.embargo_history.empty? %>
+    <% if embargo_history(curation_concern).empty? %>
       <%= t('.history_empty', cc: cc_type) %>
     <% else %>
-      <%= render partial: "embargo_history", object: curation_concern.embargo_history %>
+      <%= render partial: "embargo_history", object: embargo_history(curation_concern) %>
     <% end %>
   </div>
 </div>

data/app/views/hyrax/file_sets/_permission.html.erb

@@ -1,5 +1,5 @@
   <div id="permissions_display" class="tab-pane">
-    <%= simple_form_for [main_app, file_set],
+    <%= simple_form_for [main_app, form_object],
                         html: { multipart: true,
                                 id: 'permission',
                                 data: { param_key: file_set.model_name.param_key },

data/app/views/hyrax/file_sets/_permission_form.html.erb

@@ -1,8 +1,3 @@
-<% depositor = f.object.depositor %>
-<% public_perm = f.object.permissions.map { |perm| perm.access if perm.agent_name == "public"}.compact.first %>
-<% public_perm = true if params[:controller] == 'batch' %>
-<% registered_perm = f.object.permissions.map { |perm| perm.access if perm.agent_name == "registered"}.compact.first %>
-
 <h2 id="permissions_display"><% if params[:controller] == 'batch' %><%= t('.bulk') %> <% end %><%= t('.header') %> <% if params[:controller] == 'batch' %>
       <small><%= t('.applied_to') %></small><% end %>
 </h2>
@@ -13,7 +8,7 @@
   <span id="permissions_error_text"></span>
 </div>
 
-<%= render 'hyrax/base/form_permission', f: f %>
+<%= render 'hyrax/base/form_visibility_component', f: f %>
 
 <!-- Share With -->
 <div class="row">

data/app/views/hyrax/file_sets/edit.html.erb

@@ -6,7 +6,7 @@
 
 <div class="row">
   <div class="col-12 col-sm-4">
-    <%= render media_display_partial(curation_concern.to_presenter), file_set: curation_concern.to_presenter %>
+    <%= render media_display_partial(@presenter.solr_document), file_set: @presenter.solr_document %>
   </div>
   <div class="col-12 col-sm-8">
     <div class="card tabs">
@@ -33,7 +33,7 @@
             <h2><%= t('.descriptions') %></h2>
             <%= render "form" %>
           </div>
-          <%= render "permission", file_set: curation_concern %>
+          <%= render "permission", file_set: curation_concern, form_object: @form %>
           <%= render "versioning", file_set: curation_concern %>
         </div>
       </div>

data/app/views/hyrax/file_sets/media_display/_audio.html.erb

@@ -8,7 +8,7 @@
       </audio>
       <%= link_to t('hyrax.file_set.show.downloadable_content.audio_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id },
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/file_sets/media_display/_default.html.erb

@@ -4,7 +4,7 @@
     <p /><%= link_to t('hyrax.file_set.show.download'),
       hyrax.download_path(file_set),
       id: "file_download",
-      data: { label: file_set.id },
+      data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
       target: "_new" %>
   <% end %>
 </div>

data/app/views/hyrax/file_sets/media_display/_image.html.erb

@@ -7,7 +7,7 @@
                     role: "presentation") %>
       <%= link_to t('hyrax.file_set.show.downloadable_content.image_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id },
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/file_sets/media_display/_office_document.html.erb

@@ -9,7 +9,7 @@
                   hyrax.download_path(file_set),
                   target: :_blank,
                   id: "file_download",
-                  data: { label: file_set.id } %>
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids } %>
     </div>
 <% else %>
     <div>

data/app/views/hyrax/file_sets/media_display/_pdf.html.erb

@@ -9,7 +9,7 @@
                   hyrax.download_path(file_set),
                   target: :_blank,
                   id: "file_download",
-                  data: { label: file_set.id } %>
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids } %>
     </div>
 <% else %>
     <div>

data/app/views/hyrax/file_sets/media_display/_video.html.erb

@@ -8,7 +8,7 @@
       </video>
       <%= link_to t('hyrax.file_set.show.downloadable_content.video_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id },
+                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/leases/edit.html.erb

@@ -13,7 +13,7 @@
       <fieldset class="set-access-controls">
         <section class="form-text">
           <p>
-            <% if curation_concern.lease_expiration_date %>
+            <% if lease_enforced?(curation_concern) %>
               <%= t('.lease_true_html',  cc: cc_type) %>
             <% else %>
               <%= t('.lease_false_html', cc: cc_type) %>
@@ -29,7 +29,7 @@
 
       <div class="row">
         <div class="col-md-12 form-actions">
-          <% if curation_concern.lease_expiration_date %>
+          <% if lease_enforced?(curation_concern) %>
             <%= f.submit t('.lease_update'), class: 'btn btn-primary' %>
             <%= link_to t('.lease_deactivate'), lease_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
           <% else %>
@@ -48,7 +48,7 @@
     <h2 class="card-title"><%= t('.header.past') %></h2>
   </div>
   <div class="card-body">
-    <% if curation_concern.lease_history.empty? %>
+    <% if lease_history(curation_concern).empty? %>
       <%= t('.history_empty', cc: cc_type) %>
     <% else %>
       <%= render partial: 'lease_history', object: curation_concern.lease_history %>

data/app/views/hyrax/my/collections/_facets.html.erb

@@ -1,7 +1,9 @@
 <% # main container for facets/limits menu -%>
-<% if has_facet_values?(facet_field_names, @response) %>
-  <div class="list-filters" role="group">
-    <span class="list-filters-label"><%= t("hyrax.dashboard.my.facet_label.collections") %></span>
-    <%= render_facet_partials(facet_field_names, response: @response) %>
-  </div>
+<% facets = capture do %>
+  <%= render Blacklight::FacetComponent.with_collection(blacklight_config.facet_fields_in_group(nil), response: @response, component: Hyrax::DropdownFacetFieldComponent)%>
 <% end %>
+
+<div class="list-filters" role="group">
+  <span class="list-filters-label"><%= t("hyrax.dashboard.my.facet_label.collections") %></span>
+  <%= facets %>
+</div>

data/app/views/hyrax/my/works/_facets.html.erb

@@ -1,7 +1,11 @@
 <% # main container for facets/limits menu -%>
-<% if has_facet_values?(facet_field_names, @response) %>
+<% facets = capture do %>
+  <%= render Blacklight::FacetComponent.with_collection(blacklight_config.facet_fields_in_group(nil), response: @response, component: Hyrax::DropdownFacetFieldComponent)%>
+<% end %>
+
+<% if facets.present? %>
   <div class="list-filters" role="group">
     <span class="list-filters-label"><%= t("hyrax.dashboard.my.facet_label.works") %></span>
-    <%= render_facet_partials(facet_field_names, response: @response) %>
+    <%= facets %>
   </div>
 <% end %>

data/app/views/hyrax/transfers/_received.html.erb

@@ -49,7 +49,7 @@
       <td><%= req.sender_comment %></td>
     </tr>
     <% else %>
-      <% Rails.logger.error "A proxy request has no sender: #{req.inspect}" %>
+      <% Hyrax.logger.error "A proxy request has no sender: #{req.inspect}" %>
     <% end %>
   <% end %>
   </tbody>

data/app/views/hyrax/transfers/_sent.html.erb

@@ -32,7 +32,7 @@
           <td><%= req.sender_comment %></td>
         </tr>
       <% else %>
-          <% Rails.logger.error "A proxy request has no receiver: #{req.inspect}" %>
+          <% Hyrax.logger.error "A proxy request has no receiver: #{req.inspect}" %>
       <% end %>
     <% end %>
   </tbody>

data/app/views/hyrax/transfers/new.html.erb

@@ -5,7 +5,7 @@
 <span class="sr-only"><%= t(:'.sr_only_description', work_title: @proxy_deposit_request.to_s) %></span>
 
 <%= simple_form_for @proxy_deposit_request,
-             url: hyrax.work_transfers_path(@work) do |f| %>
+             url: hyrax.work_transfers_path(params[:id]) do |f| %>
   <%= f.input :transfer_to,
         placeholder: t(:'.placeholder') %>
   <%= f.input :sender_comment %>

data/app/views/hyrax/uploads/_js_templates.html.erb

@@ -3,18 +3,18 @@
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">
-        <td>
+        <span>
             <span class="preview"></span>
-        </td>
-        <td>
+        </span>
+        <span>
             <p class="name">{%=file.name%}</p>
             <strong class="error text-danger"></strong>
-        </td>
-        <td>
+        </span>
+        <span>
             <p class="size">Processing...</p>
             <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div></div>
-        </td>
-        <td class="text-right">
+        </span>
+        <span class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
                     <span class="fa fa-upload"></span>
@@ -27,7 +27,7 @@
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
-        </td>
+        </span>
     </tr>
 {% } %}
 </script>

data/app/views/hyrax/uploads/_js_templates_branding.html.erb

@@ -37,7 +37,7 @@
 <!-- The template to display the banner once upload is complete -->
 <script id="template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-        <span class="template-download fade">
+        <span class="template-download fade show">
           <div id="banner">
             <div class="row branding-banner-row">
               <div class="col-sm-3">
@@ -69,7 +69,7 @@
 <!-- The template to display logo in the table once upload is complete -->
 <script id="logo-template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-            <span class="template-download fade">
+            <span class="template-download fade show">
             <div class="row branding-logo-row">
               <div class="col-sm-3">
                 <span class="preview">