sufia 7.1.0 → 7.2.0

data/app/controllers/api/items_controller.rb

@@ -49,7 +49,7 @@ module API
       end
 
       def token
-        (request.get? || request.delete?) ? params[:token] : item['token']
+        request.get? || request.delete? ? params[:token] : item['token']
       end
 
       def user

data/app/controllers/concerns/sufia/admin/stats_behavior.rb

@@ -2,12 +2,18 @@ module Sufia
   module Admin
     module StatsBehavior
       extend ActiveSupport::Concern
+      included do
+        layout 'admin'
+      end
 
-      def index
+      def show
         authorize! :read, Sufia::Statistics
         stats_filters = params.fetch(:stats_filters, {})
         limit = params.fetch(:limit, "5").to_i
         @presenter = AdminStatsPresenter.new(stats_filters, limit)
+        add_breadcrumb t(:'sufia.controls.home'), root_path
+        add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
+        add_breadcrumb t(:'sufia.admin.sidebar.statistics'), sufia.admin_stats_path
       end
     end
   end

data/app/controllers/concerns/sufia/batch_edits_controller_behavior.rb

@@ -4,7 +4,7 @@ module Sufia
     include Sufia::Breadcrumbs
 
     included do
-      layout "sufia-one-column"
+      with_themed_layout '1_column'
       before_action :build_breadcrumbs, only: :edit
     end
 

data/app/controllers/concerns/sufia/batch_uploads_controller_behavior.rb

@@ -5,7 +5,6 @@ module Sufia
     include CurationConcerns::CurationConcernController
 
     included do
-      layout "sufia-one-column"
       self.curation_concern_type = form_class.model_class
     end
 

data/app/controllers/concerns/sufia/collections_controller_behavior.rb

@@ -5,7 +5,7 @@ module Sufia
 
     included do
       before_action :build_breadcrumbs, only: [:edit, :show]
-      layout "sufia-one-column"
+      with_themed_layout '1_column'
       # include the link_to_remove_from_collection view helper methods
       helper CurationConcerns::CollectionsHelper
       self.presenter_class = Sufia::CollectionPresenter

data/app/controllers/concerns/sufia/contact_form_controller_behavior.rb

@@ -1,20 +1,23 @@
 module Sufia
   module ContactFormControllerBehavior
+    extend ActiveSupport::Concern
+    included do
+      before_action :build_contact_form
+    end
+
     def new
-      @contact_form = ContactForm.new
     end
 
     def create
-      @contact_form = ContactForm.new(params[:contact_form])
-      @contact_form.request = request
       # not spam and a valid form
-      if @contact_form.deliver
+      if @contact_form.valid?
+        ContactMailer.contact(@contact_form).deliver_now
         flash.now[:notice] = 'Thank you for your message!'
         after_deliver
         @contact_form = ContactForm.new
       else
         flash.now[:error] = 'Sorry, this message was not sent successfully. '
-        flash.now[:error] << @contact_form.errors.full_messages.map(&:to_s).join(",")
+        flash.now[:error] << @contact_form.errors.full_messages.map(&:to_s).join(", ")
       end
       render :new
     rescue RuntimeError => e
@@ -28,5 +31,16 @@ module Sufia
     # response to the user.
     def after_deliver
     end
+
+    protected
+
+      def build_contact_form
+        @contact_form = Sufia::ContactForm.new(contact_form_params)
+      end
+
+      def contact_form_params
+        return {} unless params.key?(:sufia_contact_form)
+        params.require(:sufia_contact_form).permit(:contact_method, :category, :name, :email, :subject, :message)
+      end
   end
 end

data/app/controllers/concerns/sufia/deny_access_override_behavior.rb

@@ -0,0 +1,13 @@
+module Sufia
+  module DenyAccessOverrideBehavior
+    # Overriding the default behavior from Hydra::Core::ContorllerBehavior
+    def deny_access(exception)
+      if current_user && current_user.persisted?
+        redirect_to root_path, alert: exception.message
+      else
+        session['user_return_to'.freeze] = request.url
+        redirect_to new_user_session_path, alert: exception.message
+      end
+    end
+  end
+end

data/app/controllers/concerns/sufia/depositors_controller_behavior.rb

@@ -1,22 +1,13 @@
 module Sufia
   module DepositorsControllerBehavior
     extend ActiveSupport::Concern
+    include DenyAccessOverrideBehavior
 
     included do
       before_action :authenticate_user!
       before_action :validate_users, only: :create
     end
 
-    # Overriding the default behavior from Hydra::Core::ContorllerBehavior
-    def deny_access(exception)
-      if current_user && current_user.persisted?
-        redirect_to root_path, alert: exception.message
-      else
-        session['user_return_to'.freeze] = request.url
-        redirect_to new_user_session_path, alert: exception.message
-      end
-    end
-
     def create
       grantor = authorize_and_return_grantor
       grantee = ::User.from_url_component(params[:grantee_id])

data/app/controllers/concerns/sufia/file_sets_controller_behavior.rb

@@ -6,7 +6,7 @@ module Sufia
     included do
       include Blacklight::Configurable
 
-      layout "sufia-one-column"
+      with_themed_layout '1_column'
 
       copy_blacklight_config_from(CatalogController)
 

data/app/controllers/concerns/sufia/homepage_controller_behavior.rb

@@ -3,9 +3,7 @@ module Sufia::HomepageControllerBehavior
 
   included do
     # Adds Hydra behaviors into the application controller
-    include Hydra::Controller::ControllerBehavior
     include Blacklight::SearchContext
-    include Sufia::Controller
     include Blacklight::SearchHelper
     include Blacklight::AccessControls::Catalog
 
@@ -24,14 +22,25 @@ module Sufia::HomepageControllerBehavior
     @marketing_text = ContentBlock.marketing_text
     @featured_work_list = FeaturedWorkList.new
     @announcement_text = ContentBlock.announcement_text
+    @admin_sets = fetch_admin_sets
     recent
   end
 
   protected
 
+    def fetch_admin_sets
+      return [] unless Flipflop.assign_admin_set?
+      builder = CurationConcerns::AdminSetSearchBuilder.new(self, current_ability)
+                                                       .rows(5)
+      response = repository.search(builder)
+      response.documents
+    end
+
     def recent
       # grab any recent documents
       (_, @recent_documents) = search_results(q: '', sort: sort_field, rows: 4)
+    rescue Blacklight::Exceptions::ECONNREFUSED
+      @recent_documents = []
     end
 
     def sort_field

data/app/controllers/concerns/sufia/my_controller_behavior.rb

@@ -3,7 +3,6 @@ module Sufia
     extend ActiveSupport::Concern
     include Hydra::Catalog
     include Hydra::BatchEditBehavior
-    include CurationConcerns::SelectsCollections
 
     included do
       include Blacklight::Configurable
@@ -13,23 +12,16 @@ module Sufia
       before_action :authenticate_user!
       before_action :enforce_show_permissions, only: :show
       before_action :enforce_viewing_context_for_show_requests, only: :show
-      before_action :find_collections, only: :index
-      before_action :find_collections_with_edit_access, only: :index
 
       layout 'sufia-dashboard'
     end
 
     def index
+      # return the user's collections
+      @user_collections = CurationConcerns::CollectionsService.new(self).search_results(:edit)
+
       @user = current_user
       (@response, @document_list) = query_solr
-      @events = @user.events(100)
-      @last_event_timestamp = begin
-                                @user.events.first[:timestamp].to_i || 0
-                              rescue
-                                0
-                              end
-      @filters = params[:f] || []
-
       prepare_instance_variables_for_batch_control_display
 
       respond_to do |format|
@@ -44,16 +36,15 @@ module Sufia
       # TODO: Extract a presenter object that wrangles all of these instance variables.
       def prepare_instance_variables_for_batch_control_display
         # set up some parameters for allowing the batch controls to show appropriately
-        @max_batch_size = 80
+        max_batch_size = 80
         count_on_page = @document_list.count { |doc| batch.index(doc.id) }
-        @disable_select_all = @document_list.count > @max_batch_size
+        @disable_select_all = @document_list.count > max_batch_size
         batch_size = batch.uniq.size
         @result_set_size = @response.response["numFound"]
         @empty_batch = batch.empty?
         @all_checked = (count_on_page == @document_list.count)
-        @entire_result_set_selected = @response.response["numFound"] == batch_size
-        @batch_size_on_other_page = batch_size - count_on_page
-        @batch_part_on_other_page = @batch_size_on_other_page > 0
+        batch_size_on_other_page = batch_size - count_on_page
+        @batch_part_on_other_page = batch_size_on_other_page > 0
 
         @add_files_to_collection = params.fetch(:add_files_to_collection, '')
       end

data/app/controllers/concerns/sufia/singular_subresource_controller.rb

@@ -1,5 +1,6 @@
 module Sufia::SingularSubresourceController
   extend ActiveSupport::Concern
+  include DenyAccessOverrideBehavior
 
   included do
     before_action :find_work, only: :work
@@ -7,16 +8,6 @@ module Sufia::SingularSubresourceController
     load_and_authorize_resource :file, class: 'FileSet', only: :file, id_param: :id
   end
 
-  # Overriding the default behavior from Hydra::Core::ControllerBehavior
-  def deny_access(exception)
-    if current_user && current_user.persisted?
-      redirect_to root_path, alert: exception.message
-    else
-      session['user_return_to'.freeze] = request.url
-      redirect_to new_user_session_path, alert: exception.message
-    end
-  end
-
   def find_work
     @work = CurationConcerns::WorkRelation.new.find(params[:id])
   end

data/app/controllers/concerns/sufia/transfers_controller_behavior.rb

@@ -72,7 +72,7 @@ module Sufia
       end
 
       def proxy_deposit_request_params
-        params.require(:proxy_deposit_request).permit(:transfer_to)
+        params.require(:proxy_deposit_request).permit(:transfer_to, :sender_comment)
       end
   end
 end

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -3,10 +3,9 @@ module Sufia::UsersControllerBehavior
 
   included do
     include Blacklight::SearchContext
-    layout "sufia-one-column"
+    with_themed_layout '1_column'
     prepend_before_action :find_user, except: [:index, :search, :notifications_number]
-    before_action :authenticate_user!, only: [:edit, :update, :follow, :unfollow]
-    before_action :user_not_current_user, only: [:follow, :unfollow]
+    before_action :authenticate_user!, only: [:edit, :update]
     authorize_resource only: [:edit, :update]
     # Catch permission errors
     rescue_from CanCan::AccessDenied, with: :deny_access
@@ -60,24 +59,6 @@ module Sufia::UsersControllerBehavior
     ['1', 'true'].include? params[:user][:update_directory]
   end
 
-  # Follow a user
-  def follow
-    unless current_user.following?(@user)
-      current_user.follow(@user)
-      UserFollowEventJob.perform_later(current_user, @user)
-    end
-    redirect_to sufia.profile_path(@user.to_param), notice: "You are following #{@user}"
-  end
-
-  # Unfollow a user
-  def unfollow
-    if current_user.following?(@user)
-      current_user.stop_following(@user)
-      UserUnfollowEventJob.perform_later(current_user, @user)
-    end
-    redirect_to sufia.profile_path(@user.to_param), notice: "You are no longer following #{@user}"
-  end
-
   def notifications_number
     @notify_number = 0
     return if action_name == "index" && controller_name == "mailbox"
@@ -102,10 +83,6 @@ module Sufia::UsersControllerBehavior
       redirect_to root_path, alert: "User '#{params[:id]}' does not exist" if @user.nil?
     end
 
-    def user_not_current_user
-      redirect_to sufia.profile_path(@user.to_param), alert: "You cannot follow or unfollow yourself" if @user == current_user
-    end
-
     def sort_value
       sort = params[:sort].blank? ? "name" : params[:sort]
       case sort

data/app/controllers/concerns/sufia/works_controller_behavior.rb

@@ -2,12 +2,10 @@ module Sufia
   module WorksControllerBehavior
     extend ActiveSupport::Concern
     include Sufia::Breadcrumbs
-    include Sufia::Controller
     include CurationConcerns::CurationConcernController
 
     included do
       self.show_presenter = Sufia::WorkShowPresenter
-      layout "sufia-one-column"
     end
 
     module ClassMethods
@@ -16,6 +14,7 @@ module Sufia
       def curation_concern_type=(curation_concern_type)
         super
         before_action :build_breadcrumbs, only: [:edit, :show]
+        before_action :save_permissions, only: :update
       end
     end
 
@@ -60,9 +59,26 @@ module Sufia
         end
       end
 
+      def after_update_response
+        if permissions_changed? && curation_concern.file_sets.present?
+          redirect_to sufia.confirm_access_curation_concerns_permission_path(curation_concern)
+        elsif curation_concern.visibility_changed? && curation_concern.file_sets.present?
+          redirect_to main_app.confirm_curation_concerns_permission_path(curation_concern)
+        else
+          respond_to do |wants|
+            wants.html { redirect_to [main_app, curation_concern] }
+            wants.json { render :show, status: :ok, location: polymorphic_path([main_app, curation_concern]) }
+          end
+        end
+      end
+
       # Called by CurationConcerns::CurationConcernController#show
       def additional_response_formats(format)
-        format.endnote { render text: presenter.solr_document.export_as_endnote }
+        format.endnote do
+          send_data(presenter.solr_document.export_as_endnote,
+                    type: "application/x-endnote-refer",
+                    filename: presenter.solr_document.endnote_filename)
+        end
       end
 
       def add_breadcrumb_for_controller
@@ -77,5 +93,13 @@ module Sufia
           add_breadcrumb presenter.to_s, main_app.polymorphic_path(presenter)
         end
       end
+
+      def save_permissions
+        @saved_permissions = curation_concern.permissions.map(&:to_hash)
+      end
+
+      def permissions_changed?
+        @saved_permissions != curation_concern.permissions.map(&:to_hash)
+      end
   end
 end

data/app/controllers/content_blocks_controller.rb

@@ -8,12 +8,22 @@ class ContentBlocksController < ApplicationController
 
   def create
     @content_block.save
-    redirect_to :back
+    if respond_to? :redirect_back
+      redirect_back fallback_location: sufia.content_blocks_path
+    else
+      # Deprecated in Rails 5.0
+      redirect_to :back
+    end
   end
 
   def update
     @content_block.update(update_params)
-    redirect_to :back
+    if respond_to? :redirect_back
+      redirect_back fallback_location: sufia.content_blocks_path
+    else
+      # Deprecated in Rails 5.0
+      redirect_to :back
+    end
   end
 
   protected

data/app/controllers/curation_concerns/file_sets_controller.rb

@@ -1,7 +1,6 @@
 module CurationConcerns
   class FileSetsController < ApplicationController
     include CurationConcerns::FileSetsControllerBehavior
-    include Sufia::Controller
     include Sufia::FileSetsControllerBehavior
   end
 end

data/app/controllers/curation_concerns/permissions_controller.rb

@@ -1,25 +1,17 @@
-# TODO: Replace this with something that has lower technical debt
-# This controller is only needed because we override the layout that
-# CurationConcerns sets for it, to pick up Sufia's layout. We should
-# be able to remove this controller once we have updated CC to allow
-# for the layout to be configured. See here for more discussion:
-# https://github.com/projecthydra/sufia/issues/1731#issuecomment-206597463
 class CurationConcerns::PermissionsController < ApplicationController
-  include CurationConcerns::CurationConcernController
+  include CurationConcerns::PermissionsControllerBehavior
 
-  layout nil
-
-  def confirm
+  def confirm_access
+    # intentional noop to display default rails view
   end
 
-  def copy
+  def copy_access
     authorize! :edit, curation_concern
+    # copy visibility
     VisibilityCopyJob.perform_later(curation_concern)
-    flash_message = 'Updating file permissions. This may take a few minutes. You may want to refresh your browser or return to this record later to see the updated file permissions.'
-    redirect_to [main_app, curation_concern], notice: flash_message
-  end
 
-  def curation_concern
-    @curation_concern ||= ActiveFedora::Base.find(params[:id])
+    # copy permissions
+    InheritPermissionsJob.perform_later(curation_concern)
+    redirect_to [main_app, curation_concern], notice: I18n.t("sufia.upload.change_access_flash_message")
   end
 end