hyrax 2.1.0.beta1 → 2.1.0.beta2

data/app/services/hyrax/collection_member_service.rb

@@ -4,17 +4,18 @@ module Hyrax
     include Blacklight::Configurable
     include Blacklight::SearchHelper
 
-    attr_reader :item
+    attr_reader :item, :current_ability
 
     copy_blacklight_config_from(CatalogController)
 
     # @param [SolrDocument] item represents a work
-    def self.run(item)
-      new(item).list_collections
+    def self.run(item, ability)
+      new(item, ability).list_collections
     end
 
-    def initialize(item)
+    def initialize(item, ability)
       @item = item
+      @current_ability = ability
     end
 
     def list_collections
@@ -24,7 +25,7 @@ module Hyrax
     end
 
     def collection_search_builder
-      @collection_search_builder ||= ParentCollectionSearchBuilder.new([:include_item_ids, :add_paging_to_solr], self)
+      @collection_search_builder ||= ParentCollectionSearchBuilder.new([:include_item_ids, :add_paging_to_solr, :add_access_controls_to_solr_params], self)
     end
   end
 end

data/app/services/hyrax/collection_types/create_service.rb

@@ -14,6 +14,7 @@ module Hyrax
       DEFAULT_OPTIONS = {
         description: '',
         nestable: true,
+        brandable: true,
         discoverable: true,
         sharable: true,
         share_applies_to_new_works: true,
@@ -30,6 +31,7 @@ module Hyrax
       USER_COLLECTION_OPTIONS = {
         description: I18n.t('hyrax.collection_types.create_service.default_description'),
         nestable: true,
+        brandable: true,
         discoverable: true,
         sharable: true,
         share_applies_to_new_works: false,
@@ -46,6 +48,7 @@ module Hyrax
       ADMIN_SET_OPTIONS = {
         description: I18n.t('hyrax.collection_types.create_service.admin_set_description'),
         nestable: false,
+        brandable: false,
         discoverable: false,
         sharable: true,
         share_applies_to_new_works: true,
@@ -66,6 +69,7 @@ module Hyrax
       # @param options [Hash] options to override DEFAULT_OPTIONS
       # @option options [String] :description a description to show the user when selecting the collection type
       # @option options [Boolean] :nestable if true, collections of this type can be nested
+      # @option options [Boolean] :brandable if true, collections of this type can be branded
       # @option options [Boolean] :discoverable if true, collections of this type can be marked Public and found in search results
       # @option options [Boolean] :sharable if true, collections of this type can have participants added for :manage, :deposit, or :view access
       # @option options [Boolean] :share_applies_to_new_works if true, share participant permissions are applied to new works created in the collection
@@ -119,23 +123,46 @@ module Hyrax
         add_participants(collection_type_id, default_participants)
       end
 
+      ##
       # @api public
       #
       # Add a participants to a collection_type.
       #
       # @param collection_type_id [Integer] the id of the collection type
-      # @param participants [Array<Hash>] each element holds agent_type, agent_id, and access for a participant to be added
+      # @param participants [Array<Hash>] each element holds agent_type, agent_id,
+      #   and access for a participant to be added
+      #
+      # @raise [InvalidParticipantError] if a participant is missing an
+      #   `agent_type`, `agent_id`, or `access`.
       def self.add_participants(collection_type_id, participants)
-        return unless collection_type_id && participants.count > 0
+        raise(InvalidParticipantError, participants) unless
+          participants.all? { |p| p.key?(:agent_type) && p.key?(:agent_id) && p.key?(:access) }
+
         participants.each do |p|
-          begin
-            agent_type = p.fetch(:agent_type)
-            agent_id = p.fetch(:agent_id)
-            access = p.fetch(:access)
-            Hyrax::CollectionTypeParticipant.create!(hyrax_collection_type_id: collection_type_id, agent_type: agent_type, agent_id: agent_id, access: access)
-          rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
-            Rails.logger.error "Participant not created for collection type #{collection_type_id}: #{agent_type}, #{agent_id}, #{access} -- reason: #{e.class.name} - #{e.message}\n"
-          end
+          Hyrax::CollectionTypeParticipant.create!(hyrax_collection_type_id: collection_type_id, agent_type: p.fetch(:agent_type), agent_id: p.fetch(:agent_id), access: p.fetch(:access))
+        end
+      rescue InvalidParticipantError => error
+        Rails.logger.error "Participants not created for collection type " \
+                           " #{collection_type_id}: #{error.message}"
+        raise error
+      end
+
+      ##
+      # An error class for the case that invalid/incomplete participants are
+      # added to a collection type.
+      class InvalidParticipantError < RuntimeError
+        attr_reader :participants
+
+        def initialize(participants)
+          @participants = participants
+        end
+
+        ##
+        # @return [String]
+        def message
+          @participants.map do |participant|
+            "#{participant[:agent_type]}, #{participant[:agent_id]}, #{participant[:access]}"
+          end.join("--\n")
         end
       end
     end

data/app/services/hyrax/collections/permissions_create_service.rb

@@ -30,9 +30,7 @@ module Hyrax
           { agent_type: 'group', agent_id: admin_group_name, access: Hyrax::PermissionTemplateAccess::MANAGE }
         ].tap do |attribute_list|
           # Grant manage access to the creating_user if it exists
-          if creating_user
-            attribute_list << { agent_type: 'user', agent_id: creating_user.user_key, access: Hyrax::PermissionTemplateAccess::MANAGE }
-          end
+          attribute_list << { agent_type: 'user', agent_id: creating_user.user_key, access: Hyrax::PermissionTemplateAccess::MANAGE } if creating_user
         end + managers_of_collection_type(collection_type: collection_type) + grants
       end
       private_class_method :access_grants_attributes

data/app/services/hyrax/collections/permissions_service.rb

@@ -8,9 +8,10 @@ module Hyrax
       # @param access [Array<String>] one or more types of access (e.g. Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT, Hyrax::PermissionTemplateAccess::VIEW)
       # @param ability [Ability] the ability coming from cancan ability check
       # @param source_type [String] 'collection', 'admin_set', or nil to get all types
+      # @param exclude_groups [Array<String>] name of groups to exclude from the results
       # @return [Array<String>] IDs of collections and admin sets for which the user has specified roles
-      def self.source_ids_for_user(access:, ability:, source_type: nil)
-        scope = PermissionTemplateAccess.for_user(ability: ability, access: access)
+      def self.source_ids_for_user(access:, ability:, source_type: nil, exclude_groups: [])
+        scope = PermissionTemplateAccess.for_user(ability: ability, access: access, exclude_groups: exclude_groups)
                                         .joins(:permission_template)
         ids = scope.pluck('DISTINCT source_id')
         return ids unless source_type
@@ -64,11 +65,12 @@ module Hyrax
       #
       # @param ability [Ability] the ability coming from cancan ability check
       # @param source_type [String] 'collection', 'admin_set', or nil to get all types
+      # @param exclude_groups [Array<String>] name of groups to exclude from the results
       # @return [Array<String>] IDs of collections and/or admin_sets into which the user can deposit
       # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.source_ids_for_deposit(ability:, source_type: nil)
+      def self.source_ids_for_deposit(ability:, source_type: nil, exclude_groups: [])
         access = [Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT]
-        source_ids_for_user(access: access, ability: ability, source_type: source_type)
+        source_ids_for_user(access: access, ability: ability, source_type: source_type, exclude_groups: exclude_groups)
       end
 
       # @api public

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

@@ -1,4 +1,4 @@
 <div class="search-results-title-row">
-  <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
+  <h4 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h4>
   <span class="label label-success"><%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %></span>
 </div>

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

@@ -1,3 +1,3 @@
 <div class="search-results-title-row">
-  <h3 class="search-result-title"><%= link_to document.title_or_label, document %></h3>
+  <h4 class="search-result-title"><%= link_to document.title_or_label, document %></h4>
 </div>

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

@@ -1,23 +1,19 @@
-<div class="col-sm-5">
+<div class="col-md-6">
   <div class="metadata">
+    <dl class="dl-horizontal">
     <% doc_presenter = index_presenter(document) %>
     <% index_fields(document).each do |field_name, field| -%>
       <% if should_render_index_field? document, field %>
-        <div class="row metadata-row">
-          <div class="col-sm-4">
-            <%= render_index_field_label document, field: field_name %>
-          </div>
-          <div class="col-sm-8">
-            <%= doc_presenter.field_value field_name %>
-          </div>
-        </div>
+          <dt><%= render_index_field_label document, field: field_name %></dt>
+          <dd><%= doc_presenter.field_value field_name %></dd>
       <% end %>
     <% end %>
+    </dl>
   </div>
 </div>
 <% if(doc_presenter.field_value('has_model_ssim') == 'Collection') %>
     <% collection_presenter = Hyrax::CollectionPresenter.new(document, current_ability) %>
-<div class="col-sm-4">
+<div class="col-md-4">
   <div class="collection-counts-wrapper">
     <div class="collection-counts-item">
       <span><%= collection_presenter.total_viewable_collections %></span>Collections

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

@@ -10,18 +10,17 @@
       <button type="submit" class="btn btn-primary" id="search-submit-header">
         <%= t('hyrax.search.button.html') %>
       </button>
-      <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
-        <span data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
-        <span class="caret"></span>
-      </button>
-
-      <ul class="dropdown-menu pull-right">
-        <li>
-          <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
-              data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
-        </li>
+      <% if current_user %>
+        <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
+          <span data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
+          <span class="caret"></span>
+        </button>
 
-        <% if current_user %>
+        <ul class="dropdown-menu pull-right">
+          <li>
+            <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
+                data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
+          </li>
           <li>
             <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#",
                 data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>

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

@@ -1,3 +1,3 @@
-<div class="col-sm-3">
+<div class="col-md-2">
   <span class="<%= Hyrax::ModelIcon.css_class_for(Collection) %> collection-icon-search"></span>
 </div>

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

@@ -1,4 +1,4 @@
-<div class="col-sm-3">
+<div class="col-md-2">
   <div class="list-thumbnail">
     <%= render_thumbnail_tag document %>
   </div>

data/app/views/hyrax/admin/admin_sets/_form.html.erb

@@ -33,7 +33,7 @@
               <div class="panel-footer">
                 <% cancel_path = f.object.persisted? ? hyrax.admin_admin_set_path(f.object) : hyrax.dashboard_collections_path %>
                 <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default pull-right' %>
-                <%= f.button :submit, class: 'btn btn-primary pull-right'%>
+                <%= f.button :submit, class: 'btn btn-primary pull-right' %>
               </div>
             <% end %>
           </div>

data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb

@@ -30,4 +30,4 @@
                   <% end %>
                   <%= button_tag t('.allow_all_registered'),
                                  class: 'btn btn-info',
-                                 data: { behavior: 'add-registered-users' } if access == 'depositors'%>
+                                 data: { behavior: 'add-registered-users' } if access == 'depositors' %>

data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb

@@ -51,7 +51,7 @@
                                      class: 'form-control' %>
 
                         <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
-                        <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note')%></p>
+                        <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note') %></p>
                       </div>
                     </div>
                   <% end %>

data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb

@@ -33,7 +33,7 @@
                       </li>
                       <li class="radio form-inline">
                         <label>
-                          <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO  %>
+                          <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO %>
                           <%= t('.release.varies.period') %>
                           <%= f.collection_select :release_embargo, f.object.embargo_options, :first, :last, prompt: t('.release.varies.embargo.select') %>
                         </label>
@@ -56,8 +56,8 @@
                   <% end %>
                 </div>
                 <div class="panel-footer">
-                  <%= link_to t('.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
-                  <%= f.button :submit, class: 'btn btn-primary pull-right'%>
+                  <%= link_to t('.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
+                  <%= f.button :submit, class: 'btn btn-primary pull-right' %>
                 </div>
               <% end %>
             </div>

data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb

@@ -3,7 +3,7 @@
 <tr id="document_<%= id %>">
   <td>&nbsp;
     <% if current_user and document.depositor != current_user.user_key %>
-      <i class="glyphicon glyphicon-share-alt"/>
+      <i class="glyphicon glyphicon-share-alt" />
     <% end %>
   </td>
   <td>
@@ -42,7 +42,7 @@
       <dd class="col-xs-9 col-lg-10">
         <% if document.edit_groups.present? %>
           Groups: <%= document.edit_groups.join(', ') %>
-          <br/>
+          <br />
         <% end %>
         Users: <%= document.edit_people.join(', ') %>
       </dd>

data/app/views/hyrax/admin/admin_sets/index.html.erb

@@ -1,6 +1,6 @@
 <% provide :page_header do %>
   <h1><span class="fa fa-sitemap"></span> Administrative Sets</h1>
-  <%if can? :create, AdminSet %>
+  <% if can? :create, AdminSet %>
     <div class="pull-right">
       <%= link_to hyrax.new_admin_admin_set_path, class: 'btn btn-primary' do %>
         <span class="fa fa-edit"></span> <%= t(:'helpers.action.admin_set.new') %>

data/app/views/hyrax/admin/appearances/show.html.erb

@@ -6,10 +6,10 @@
   <div class="panel-body">
     <%= simple_form_for @form, url: admin_appearance_path do |f| %>
       <%= f.input :header_background_color, required: false, input_html: { type: 'color' } %>
-      <%= f.input :header_text_color, required: false, input_html: { type: 'color' }  %>
-      <%= f.input :link_color, required: false, input_html: { type: 'color' }  %>
-      <%= f.input :footer_link_color, required: false, input_html: { type: 'color' }  %>
-      <%= f.input :primary_button_background_color, required: false, input_html: { type: 'color' }  %>
+      <%= f.input :header_text_color, required: false, input_html: { type: 'color' } %>
+      <%= f.input :link_color, required: false, input_html: { type: 'color' } %>
+      <%= f.input :footer_link_color, required: false, input_html: { type: 'color' } %>
+      <%= f.input :primary_button_background_color, required: false, input_html: { type: 'color' } %>
       <%= f.submit class: 'btn btn-primary' %>
     <% end %>
   </div>

data/app/views/hyrax/admin/collection_types/_form_settings.html.erb

@@ -5,6 +5,7 @@
 <div class="collection-types-settings">
   <div class="form-inline">
     <p><%= f.input :nestable, as: :boolean, disabled: f.object.all_settings_disabled? %></p>
+    <p><%= f.input :brandable, as: :boolean, disabled: f.object.all_settings_disabled? %></p>
     <p><%= f.input :discoverable, as: :boolean, disabled: f.object.all_settings_disabled? %></p>
     <p><%= f.input :sharable, as: :boolean, disabled: f.object.all_settings_disabled? %></p>
     <% # Using html instead of simple_form to allow adding of disabled class to elements through javascript settings.es6 %>
@@ -15,7 +16,7 @@
           <input value="0"
                  name="collection_type[share_applies_to_new_works]"
                  type="hidden"
-                 <%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %> >
+                 <%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %> />
           <label id="sharable-applies-to-new-works-setting-label"
                  class="boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
                  for="collection_type_share_applies_to_new_works">
@@ -24,7 +25,7 @@
                    value="1"
                    <%= "checked=\"checked\"".html_safe if f.object.share_applies_to_new_works %>"
                    name="collection_type[share_applies_to_new_works]"
-                   type="checkbox">
+                   type="checkbox" />
             APPLY TO NEW WORKS
           </label>
         </div>

data/app/views/hyrax/admin/collection_types/index.html.erb

@@ -38,7 +38,7 @@
                   <%= t('helpers.action.edit') %>
                  <% end %>
                  <% unless collection_type.admin_set? || collection_type.user_collection? %>
-                  <button class="btn btn-danger btn-sm delete-collection-type" 
+                  <button class="btn btn-danger btn-sm delete-collection-type"
                           data-collection-type="<%= collection_type.to_json %>"
                           data-collection-type-index="<%= hyrax.dashboard_collections_path({ 'f[collection_type_gid_ssim][]' => collection_type.gid, 'f[has_model_ssim][]' => 'Collection' }) %>"
                           data-has-collections="<%= collection_type.collections? %>">
@@ -79,7 +79,7 @@
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
-	  <%= link_to  t('.modal.view_collections'), hyrax.my_collections_path, class: 'btn btn-primary view-collections-of-this-type', data_dismiss: 'modal' %>
+    <%= link_to  t('.modal.view_collections'), hyrax.my_collections_path, class: 'btn btn-primary view-collections-of-this-type', data_dismiss: 'modal' %>
         </div>
       </div>
     </div>

data/app/views/hyrax/admin/features/index.html.erb

@@ -44,14 +44,12 @@
                           <%= submit_tag "on",
                             type: "submit",
                             class: Flipflop.enabled?(feature.name.to_sym) ? 'active' : nil,
-                            disabled: !strategy.switchable?
-                          -%>
+                            disabled: !strategy.switchable? -%>
 
                           <%= submit_tag "off",
                             type: "submit",
                             class: Flipflop.enabled?(feature.name.to_sym) ? nil : 'active',
-                            disabled: !strategy.switchable?
-                          -%>
+                            disabled: !strategy.switchable? -%>
                         </div>
                       <% end -%>
                     </div>

data/app/views/hyrax/admin/stats/_date_form.html.erb

@@ -1,8 +1,8 @@
 <%= form_for "stats_filters", url: hyrax.admin_stats_path, method: "GET" do |f| %>
+  <input type='hidden' name='locale' value="<%= params[:locale] %>" />
   <%= f.label "Start *" %>
-  <input type="date" name="stats_filters[start_date]" value="<%= @presenter.stats_filters[:start_date] %>" placeholder="yyyy-mm-dd" ></input>
+  <input type="date" name="stats_filters[start_date]" value="<%= @presenter.stats_filters[:start_date] %>" placeholder="yyyy-mm-dd"></input>
   <%= f.label "end [defaults to now]" %>
-  <input type="date" name="stats_filters[end_date]" value="<%= @presenter.stats_filters[:end_date] %>" placeholder="yyyy-mm-dd" ></input>
+  <input type="date" name="stats_filters[end_date]" value="<%= @presenter.stats_filters[:end_date] %>" placeholder="yyyy-mm-dd"></input>
   <%= f.submit "Load Stats" %>
 <%- end %>
-

data/app/views/hyrax/admin/stats/_top_data.html.erb

@@ -13,7 +13,7 @@
   <% end %>
 </ul>
 
-<br/>
+<br />
 <h3>Most Active Users (top <%= @presenter.active_users.count %>)</h3>
 <ul>
   <% @presenter.active_users.each do |user| %>

data/app/views/hyrax/admin/stats/show.html.erb

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-sm-12">
     <%= render "stats_by_date" %>
-    <hr/>
+    <hr />
     <%= render "top_data" %>
   </div>
 </div>

data/app/views/hyrax/admin/workflows/index.html.erb

@@ -2,7 +2,6 @@
   <h1><span class="glyphicon glyphicon-ok-circle"></span> <%= t('.header') %></h1>
 <% end %>
 
-
 <div class="row">
   <div class="col-md-12">
     <div class="panel panel-default tabs">