hyrax 2.8.0 → 3.0.0.pre.rc2

data/app/controllers/hyrax/admin/admin_sets_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class Admin::AdminSetsController < ApplicationController
     include Hyrax::CollectionsControllerBehavior
@@ -101,65 +102,65 @@ module Hyrax
 
     private
 
-      def update_referer
-        hyrax.edit_admin_admin_set_path(@admin_set) + (params[:referer_anchor] || '')
-      end
+    def update_referer
+      hyrax.edit_admin_admin_set_path(@admin_set) + (params[:referer_anchor] || '')
+    end
 
-      def ensure_manager!
-        # TODO: Review for possible removal.  Doesn't appear to apply anymore.
-        # Even though the user can view this admin set, they may not be able to view
-        # it on the admin page.
-        authorize! :manage_any, AdminSet
-      end
+    def ensure_manager!
+      # TODO: Review for possible removal.  Doesn't appear to apply anymore.
+      # Even though the user can view this admin set, they may not be able to view
+      # it on the admin page.
+      authorize! :manage_any, AdminSet
+    end
 
-      def ensure_viewer!
-        # Even though the user can view this admin set, they may not be able to view
-        # it on the admin page if access is granted as a public or registered user only.
-        authorize! :view_admin_show, @admin_set
-      end
+    def ensure_viewer!
+      # Even though the user can view this admin set, they may not be able to view
+      # it on the admin page if access is granted as a public or registered user only.
+      authorize! :view_admin_show, @admin_set
+    end
 
-      def create_admin_set
-        admin_set_create_service.call(admin_set: @admin_set, creating_user: current_user)
-      end
+    def create_admin_set
+      admin_set_create_service.call(admin_set: @admin_set, creating_user: current_user)
+    end
 
-      def setup_form
-        add_breadcrumb t(:'hyrax.controls.home'), root_path
-        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-        add_breadcrumb t(:'hyrax.dashboard.my.collections'), hyrax.my_collections_path
-        add_breadcrumb action_breadcrumb, request.path
-        form
-      end
+    def setup_form
+      add_breadcrumb t(:'hyrax.controls.home'), root_path
+      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+      add_breadcrumb t(:'hyrax.dashboard.my.collections'), hyrax.my_collections_path
+      add_breadcrumb action_breadcrumb, request.path
+      form
+    end
 
-      # initialize the form object
-      def form
-        @form ||= form_class.new(@admin_set, current_ability, repository)
-      end
+    # initialize the form object
+    def form
+      @form ||= form_class.new(@admin_set, current_ability, repository)
+    end
 
-      def action_breadcrumb
-        case action_name
-        when 'edit', 'update'
-          t(:'helpers.action.edit')
-        else
-          t(:'helpers.action.admin_set.new')
-        end
+    def action_breadcrumb
+      case action_name
+      when 'edit', 'update'
+        t(:'helpers.action.edit')
+      else
+        t(:'helpers.action.admin_set.new')
       end
+    end
 
-      def admin_set_params
-        form_class.model_attributes(params[:admin_set])
-      end
+    def admin_set_params
+      form_class.model_attributes(params[:admin_set])
+    end
 
-      def repository_class
-        blacklight_config.repository_class
-      end
+    def repository_class
+      blacklight_config.repository_class
+    end
 
-      def after_delete_success
-        if request.referer.include? "my/collections"
-          redirect_to hyrax.my_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
-        elsif request.referer.include? "collections"
-          redirect_to hyrax.dashboard_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
-        else
-          redirect_to hyrax.my_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
-        end
+    def after_delete_success
+      if request.referer.include? "my/collections"
+        redirect_to hyrax.my_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
+      elsif request.referer.include? "collections"
+        redirect_to hyrax.dashboard_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
+      else
+        redirect_to hyrax.my_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
       end
+    end
   end
 end

data/app/controllers/hyrax/admin/appearances_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Admin
     class AppearancesController < ApplicationController
@@ -21,13 +22,13 @@ module Hyrax
 
       private
 
-        def update_params
-          params.require(:admin_appearance).permit(form_class.permitted_params)
-        end
+      def update_params
+        params.require(:admin_appearance).permit(form_class.permitted_params)
+      end
 
-        def require_permissions
-          authorize! :update, :appearance
-        end
+      def require_permissions
+        authorize! :update, :appearance
+      end
     end
   end
 end

data/app/controllers/hyrax/admin/collection_type_participants_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class Admin::CollectionTypeParticipantsController < ApplicationController
     before_action do

data/app/controllers/hyrax/admin/collection_types_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class Admin::CollectionTypesController < ApplicationController
     before_action do
@@ -65,43 +66,41 @@ module Hyrax
 
     private
 
-      def report_error_msg
-        error_msg = @collection_type.errors.messages
-        msg = 'Save was not successful because '
-        error_msg.each { |k, v| msg << k.to_s + ' ' + v.join(', ') + ', and ' }
-        msg.chomp!(', and ')
-        msg << '.'
-        flash[:error] = msg
-      end
+    def report_error_msg
+      messages = @collection_type.errors.messages
+      msg = 'Save was not successful because ' +
+            messages.map { |k, v| k.to_s + ' ' + v.join(', ') + ', and ' }.join
+      flash[:error] = msg.chomp(', and ') + '.'
+    end
 
-      def update_referer
-        hyrax.edit_admin_collection_type_path(@collection_type) + (params[:referer_anchor] || '')
-      end
+    def update_referer
+      hyrax.edit_admin_collection_type_path(@collection_type) + (params[:referer_anchor] || '')
+    end
 
-      def add_common_breadcrumbs
-        add_breadcrumb t(:'hyrax.controls.home'), root_path
-        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-        add_breadcrumb t(:'hyrax.admin.sidebar.configuration'), '#'
-        add_breadcrumb t(:'hyrax.admin.collection_types.index.breadcrumb'), hyrax.admin_collection_types_path
-      end
+    def add_common_breadcrumbs
+      add_breadcrumb t(:'hyrax.controls.home'), root_path
+      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+      add_breadcrumb t(:'hyrax.admin.sidebar.configuration'), '#'
+      add_breadcrumb t(:'hyrax.admin.collection_types.index.breadcrumb'), hyrax.admin_collection_types_path
+    end
 
-      # initialize the form object
-      def form
-        @form ||= form_class.new(collection_type: @collection_type)
-      end
-      alias setup_form form
+    # initialize the form object
+    def form
+      @form ||= form_class.new(collection_type: @collection_type)
+    end
+    alias setup_form form
 
-      def setup_participants_form
-        @collection_type_participant = Hyrax::Forms::Admin::CollectionTypeParticipantForm.new(collection_type_participant: @collection_type.collection_type_participants.build)
-      end
+    def setup_participants_form
+      @collection_type_participant = Hyrax::Forms::Admin::CollectionTypeParticipantForm.new(collection_type_participant: @collection_type.collection_type_participants.build)
+    end
 
-      def set_collection_type
-        @collection_type = Hyrax::CollectionType.find(params[:id])
-      end
+    def set_collection_type
+      @collection_type = Hyrax::CollectionType.find(params[:id])
+    end
 
-      def collection_type_params
-        params.require(:collection_type).permit(:title, :description, :nestable, :brandable, :discoverable, :sharable, :share_applies_to_new_works,
-                                                :allow_multiple_membership, :require_membership, :assigns_workflow, :assigns_visibility, :badge_color)
-      end
+    def collection_type_params
+      params.require(:collection_type).permit(:title, :description, :nestable, :brandable, :discoverable, :sharable, :share_applies_to_new_works,
+                                              :allow_multiple_membership, :require_membership, :assigns_workflow, :assigns_visibility, :badge_color)
+    end
   end
 end

data/app/controllers/hyrax/admin/features_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Admin
     class FeaturesController < Flipflop::FeaturesController

data/app/controllers/hyrax/admin/permission_template_accesses_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Admin
     class PermissionTemplateAccessesController < ApplicationController
@@ -18,62 +19,62 @@ module Hyrax
 
       private
 
-        # This is a controller validation rather than a model validation
-        # because we don't want to prevent the ability to remove the whole
-        # PermissionTemplate and all of its associated PermissionTemplateAccesses
-        # @return [Boolean] true if it's valid
-        def valid_delete?
-          return true unless @permission_template_access.admin_group?
-          @permission_template_access.errors[:base] <<
-            t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group')
-          false
-        end
+      # This is a controller validation rather than a model validation
+      # because we don't want to prevent the ability to remove the whole
+      # PermissionTemplate and all of its associated PermissionTemplateAccesses
+      # @return [Boolean] true if it's valid
+      def valid_delete?
+        return true unless @permission_template_access.admin_group?
+        @permission_template_access.errors[:base] <<
+          t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group')
+        false
+      end
 
-        def update_access(manage_changed:)
-          permission_template_form.update_access(manage_changed: manage_changed)
-        end
+      def update_access(manage_changed:)
+        permission_template_form.update_access(manage_changed: manage_changed)
+      end
 
-        def after_destroy_success
-          if source.admin_set?
-            redirect_to hyrax.edit_admin_admin_set_path(source_id,
-                                                        anchor: 'participants'),
-                        notice: translate('participants', scope: 'hyrax.admin.admin_sets.form.permission_update_notices')
-          elsif source.collection?
-            redirect_to hyrax.edit_dashboard_collection_path(source_id,
-                                                             anchor: 'sharing'),
-                        notice: translate('sharing', scope: 'hyrax.dashboard.collections.form.permission_update_notices')
-          end
+      def after_destroy_success
+        if source.admin_set?
+          redirect_to hyrax.edit_admin_admin_set_path(source_id,
+                                                      anchor: 'participants'),
+                      notice: translate('participants', scope: 'hyrax.admin.admin_sets.form.permission_update_notices')
+        elsif source.collection?
+          redirect_to hyrax.edit_dashboard_collection_path(source_id,
+                                                           anchor: 'sharing'),
+                      notice: translate('sharing', scope: 'hyrax.dashboard.collections.form.permission_update_notices')
         end
+      end
 
-        def after_destroy_error
-          if source.admin_set?
-            redirect_to hyrax.edit_admin_admin_set_path(source_id,
-                                                        anchor: 'participants'),
-                        alert: @permission_template_access.errors.full_messages.to_sentence
-          elsif source.collection?
-            redirect_to hyrax.edit_dashboard_collection_path(source_id,
-                                                             anchor: 'sharing'),
-                        alert: @permission_template_access.errors.full_messages.to_sentence
-          end
+      def after_destroy_error
+        if source.admin_set?
+          redirect_to hyrax.edit_admin_admin_set_path(source_id,
+                                                      anchor: 'participants'),
+                      alert: @permission_template_access.errors.full_messages.to_sentence
+        elsif source.collection?
+          redirect_to hyrax.edit_dashboard_collection_path(source_id,
+                                                           anchor: 'sharing'),
+                      alert: @permission_template_access.errors.full_messages.to_sentence
         end
+      end
 
-        delegate :source_id, to: :permission_template
+      delegate :source_id, to: :permission_template
 
-        def source
-          @source ||= ::SolrDocument.find(source_id)
-        end
+      def source
+        @source ||= ::SolrDocument.find(source_id)
+      end
 
-        def remove_access!
-          permission_template_form.remove_access!(@permission_template_access)
-        end
+      def remove_access!
+        permission_template_form.remove_access!(@permission_template_access)
+      end
 
-        def permission_template_form
-          @permission_template_form ||= Forms::PermissionTemplateForm.new(permission_template)
-        end
+      def permission_template_form
+        @permission_template_form ||= Forms::PermissionTemplateForm.new(permission_template)
+      end
 
-        def permission_template
-          @permission_template ||= @permission_template_access.permission_template
-        end
+      def permission_template
+        @permission_template ||= @permission_template_access.permission_template
+      end
     end
   end
 end

data/app/controllers/hyrax/admin/permission_templates_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Admin
     class PermissionTemplatesController < ApplicationController
@@ -15,81 +16,81 @@ module Hyrax
 
       private
 
-        # Override the default prefixes so that we use the correct partials.
-        def _prefixes
-          if admin_set?
-            @_prefixes ||= super + ['hyrax/admin/admin_sets']
-          elsif collection?
-            @_prefixes ||= super + ['hyrax/dashboard/collections']
-          end
+      # Override the default prefixes so that we use the correct partials.
+      def _prefixes
+        if admin_set?
+          @_prefixes ||= super + ['hyrax/admin/admin_sets']
+        elsif collection?
+          @_prefixes ||= super + ['hyrax/dashboard/collections']
         end
+      end
 
-        # We need to do this manually instead of using load_and_authorize_resource
-        # because the id we are looking for is different when using an admin set vs. collection
-        def find_permission_template
-          if admin_set?
-            @permission_template = PermissionTemplate.find_by(source_id: params[:admin_set_id])
-          elsif collection?
-            @permission_template = PermissionTemplate.find_by(source_id: params[:collection_id])
-          end
+      # We need to do this manually instead of using load_and_authorize_resource
+      # because the id we are looking for is different when using an admin set vs. collection
+      def find_permission_template
+        if admin_set?
+          @permission_template = PermissionTemplate.find_by(source_id: params[:admin_set_id])
+        elsif collection?
+          @permission_template = PermissionTemplate.find_by(source_id: params[:collection_id])
         end
+      end
 
-        def redirect_to_edit_path(update_info)
-          if admin_set?
-            redirect_to(edit_admin_admin_set_path(params[:admin_set_id], anchor: current_tab),
-                        notice: translate(update_info[:content_tab], scope: 'hyrax.admin.admin_sets.form.permission_update_notices'))
-          elsif collection?
-            redirect_to(edit_dashboard_collection_path(params[:collection_id], anchor: current_tab),
-                        notice: translate(update_info[:content_tab], scope: 'hyrax.dashboard.collections.form.permission_update_notices'))
-          end
+      def redirect_to_edit_path(update_info)
+        if admin_set?
+          redirect_to(edit_admin_admin_set_path(params[:admin_set_id], anchor: current_tab),
+                      notice: translate(update_info[:content_tab], scope: 'hyrax.admin.admin_sets.form.permission_update_notices'))
+        elsif collection?
+          redirect_to(edit_dashboard_collection_path(params[:collection_id], anchor: current_tab),
+                      notice: translate(update_info[:content_tab], scope: 'hyrax.dashboard.collections.form.permission_update_notices'))
         end
+      end
 
-        def redirect_to_edit_path_with_error(update_info)
-          # When we have invalid data, we are redirecting because to render, we need to set an AdminSetForm
-          # (because we are rendering admin set forms)
-          # TODO: [Jeremy Friesen says: We need to better consolidate the form logic of admin sets and permission templates
-          if admin_set?
-            redirect_to(edit_admin_admin_set_path(params[:admin_set_id], anchor: current_tab),
-                        alert: translate(update_info[:error_code], scope: 'hyrax.admin.admin_sets.form.permission_update_errors'))
-          elsif collection?
-            redirect_to(edit_dashboard_collection_path(params[:collection_id], anchor: current_tab),
-                        alert: translate(update_info[:error_code], scope: 'hyrax.dashboard.collections.form.permission_update_errors'))
-          end
+      def redirect_to_edit_path_with_error(update_info)
+        # When we have invalid data, we are redirecting because to render, we need to set an AdminSetForm
+        # (because we are rendering admin set forms)
+        # TODO: [Jeremy Friesen says: We need to better consolidate the form logic of admin sets and permission templates
+        if admin_set?
+          redirect_to(edit_admin_admin_set_path(params[:admin_set_id], anchor: current_tab),
+                      alert: translate(update_info[:error_code], scope: 'hyrax.admin.admin_sets.form.permission_update_errors'))
+        elsif collection?
+          redirect_to(edit_dashboard_collection_path(params[:collection_id], anchor: current_tab),
+                      alert: translate(update_info[:error_code], scope: 'hyrax.dashboard.collections.form.permission_update_errors'))
         end
+      end
 
-        def form
-          Forms::PermissionTemplateForm.new(@permission_template)
-        end
+      def form
+        Forms::PermissionTemplateForm.new(@permission_template)
+      end
 
-        def update_params
-          params.require(:permission_template)
-                .permit(:release_date, :release_period, :release_varies, :release_embargo, :visibility, :workflow_id,
-                        access_grants_attributes: [:access, :agent_id, :agent_type, :id])
-        end
+      def update_params
+        params.require(:permission_template)
+              .permit(:release_date, :release_period, :release_varies, :release_embargo, :visibility, :workflow_id,
+                      access_grants_attributes: [:access, :agent_id, :agent_type, :id])
+      end
 
-        # @return [String] the name of the current UI tab to show
-        def current_tab
-          if collection?
-            @current_tab ||= 'sharing'
-          else
-            pt = params[:permission_template]
-            @current_tab ||= if pt[:access_grants_attributes].present?
-                               'participants'
-                             elsif pt[:workflow_id].present?
-                               'workflow'
-                             else
-                               'visibility'
-                             end
-          end
+      # @return [String] the name of the current UI tab to show
+      def current_tab
+        if collection?
+          @current_tab ||= 'sharing'
+        else
+          pt = params[:permission_template]
+          @current_tab ||= if pt[:access_grants_attributes].present?
+                             'participants'
+                           elsif pt[:workflow_id].present?
+                             'workflow'
+                           else
+                             'visibility'
+                           end
         end
+      end
 
-        def admin_set?
-          params['admin_set_id'].present?
-        end
+      def admin_set?
+        params['admin_set_id'].present?
+      end
 
-        def collection?
-          params['collection_id'].present?
-        end
+      def collection?
+        params['collection_id'].present?
+      end
     end
   end
 end