hyrax 2.0.0.rc1 → 2.0.0.rc2

data/app/services/hyrax/default_middleware_stack.rb

@@ -9,7 +9,6 @@ module Hyrax
         middleware.use Hyrax::Actors::CreateWithFilesActor
         middleware.use Hyrax::Actors::CollectionsMembershipActor
         middleware.use Hyrax::Actors::AddToWorkActor
-        middleware.use Hyrax::Actors::AssignRepresentativeActor
         middleware.use Hyrax::Actors::AttachMembersActor
         middleware.use Hyrax::Actors::ApplyOrderActor
         middleware.use Hyrax::Actors::InterpretVisibilityActor

data/app/services/hyrax/file_set_derivatives_service.rb

@@ -48,15 +48,24 @@ module Hyrax
 
       def create_pdf_derivatives(filename)
         Hydra::Derivatives::PdfDerivatives.create(filename,
-                                                  outputs: [{ label: :thumbnail, format: 'jpg', size: '338x493', url: derivative_url('thumbnail') }])
+                                                  outputs: [{
+                                                    label: :thumbnail,
+                                                    format: 'jpg',
+                                                    size: '338x493',
+                                                    url: derivative_url('thumbnail'),
+                                                    layer: 0
+                                                  }])
         extract_full_text(filename, uri)
       end
 
       def create_office_document_derivatives(filename)
         Hydra::Derivatives::DocumentDerivatives.create(filename,
-                                                       outputs: [{ label: :thumbnail, format: 'jpg',
-                                                                   size: '200x150>',
-                                                                   url: derivative_url('thumbnail') }])
+                                                       outputs: [{
+                                                         label: :thumbnail, format: 'jpg',
+                                                         size: '200x150>',
+                                                         url: derivative_url('thumbnail'),
+                                                         layer: 0
+                                                       }])
         extract_full_text(filename, uri)
       end
 

data/app/services/hyrax/statistics/depositors/summary.rb

@@ -46,7 +46,7 @@ module Hyrax
           end
 
           def search_builder
-            DepositSearchBuilder.new([:include_depositor_facet], self)
+            DepositSearchBuilder.new([:include_depositor_facet, :filter_models], self)
           end
 
           # TODO: This can probably be pushed into the DepositSearchBuilder

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

@@ -41,7 +41,8 @@ module Hyrax
         @work_id = entity.proxy_for_global_id.sub(/.*\//, '')
         @title = entity.proxy_for.title.first
         @comment = comment.respond_to?(:comment) ? comment.comment.to_s : ''
-        @recipients = recipients
+        # Convert to hash with indifferent access to allow both string and symbol keys
+        @recipients = recipients.with_indifferent_access
         @user = user
         @entity = entity
       end
@@ -73,7 +74,7 @@ module Hyrax
         end
 
         def users_to_notify
-          recipients.fetch('to', []) + recipients.fetch('cc', [])
+          recipients.fetch(:to, []) + recipients.fetch(:cc, [])
         end
     end
   end

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

@@ -48,18 +48,9 @@ module Hyrax
       # @return [Hash<String, Array>] a hash with keys being the strategy (e.g. "to", "cc") and
       #                               the values are a list of users.
       def recipients(notification)
-        case entity.workflow_state.name
-        when 'pending_review'
-          # notify the managers to review the deposit (CC depositors)
-          {
-            to: entity.workflow.permission_template.agent_ids_for(access: 'manage',  agent_type: 'user'),
-            cc: entity.workflow.permission_template.agent_ids_for(access: 'deposit', agent_type: 'user')
-          }
-        else
-          notification.recipients.each_with_object({}) do |r, h|
-            h[r.recipient_strategy] ||= []
-            h[r.recipient_strategy] += PermissionQuery.scope_users_for_entity_and_roles(entity: entity, roles: r.role)
-          end
+        notification.recipients.each_with_object({}) do |r, h|
+          h[r.recipient_strategy] ||= []
+          h[r.recipient_strategy] += PermissionQuery.scope_users_for_entity_and_roles(entity: entity, roles: r.role)
         end
       end
 

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

@@ -231,8 +231,8 @@ module Hyrax
       #
       # An ActiveRecord::Relation scope that meets the following criteria:
       #
-      # * Users that are directly associated with the given entity through on or
-      #   more of the given roles
+      # * Users that are directly associated with the given entity through one or
+      #   more of the given roles within the entity's workflow
       # * Users that are indirectly associated with the given entity by group
       #   and role.
       #
@@ -248,7 +248,7 @@ module Hyrax
         agent_table = Sipity::Agent.arel_table
 
         workflow_role_id_subquery = workflow_roles.project(workflow_roles[:id]).where(
-          workflow_roles[:role_id].in(role_ids)
+          workflow_roles[:workflow_id].eq(entity.workflow_id).and(workflow_roles[:role_id].in(role_ids))
         )
 
         workflow_agent_id_subquery = workflow_responsibilities.project(workflow_responsibilities[:agent_id]).where(

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

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

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

@@ -51,6 +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>
                       </div>
                     </div>
                   <% end %>

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

@@ -34,7 +34,7 @@
                       <li class="radio form-inline">
                         <label>
                           <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO  %>
-                          <%= t('.release.varies.between') %>
+                          <%= t('.release.varies.period') %>
                           <%= f.collection_select :release_embargo, f.object.embargo_options, :first, :last, prompt: t('.release.varies.embargo.select') %>
                         </label>
                       </li>

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

@@ -10,4 +10,4 @@
 <%= presenter.attribute_to_html(:related_url, render_as: :external_link) %>
 <%= presenter.attribute_to_html(:resource_type, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:source) %>
-<%= presenter.attribute_to_html(:rights_statement) %>
+<%= presenter.attribute_to_html(:rights_statement, render_as: :rights_statement) %>

data/app/views/hyrax/collections/show.html.erb

@@ -12,6 +12,9 @@
   </div>
   <div class="col-sm-2">
     <%= render 'media_display', presenter: @presenter %>
+      <% unless has_collection_search_parameters? %>
+        <%= render 'hyrax/dashboard/collections/show_actions', presenter: @presenter %>
+      <% end %>
   </div>
 </div>
 

data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb

@@ -13,6 +13,7 @@
       <% user.can_receive_deposits_from.each do |depositor| %>
           <tr><td class="depositor-name"><%= depositor.name %></td>
             <td><%= link_to(hyrax.user_depositor_path(user, depositor), method: :delete, class: "remove-proxy-button") do %>
+                  <span class="sr-only"><%= I18n.t('hyrax.dashboard.proxy_delete') %></span>
                   <i class="glyphicon glyphicon-remove"></i><% end %>
             </td></tr>
       <% end %>

data/app/views/hyrax/notifications/_notifications.html.erb

@@ -24,6 +24,7 @@
                       class: "itemicon itemtrash",
                       title: t('hyrax.mailbox.delete'),
                       method: :delete do %>
+                  <span class="sr-only"><%= I18n.t('hyrax.dashboard.delete_notification') %></span>
                 <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
                 <% end %>
             </td>

data/config/locales/hyrax.de.yml

@@ -72,6 +72,7 @@ de:
           header: Admin-Set bearbeiten
         form:
           cancel: Abbrechen
+          note: Benutzern, denen eine neue Rolle zugewiesen wurde, wird nur die Rolle zugewiesen, die nach der Gewährung dieser Rolle hinterlegt wurde.
           permission_destroy_errors:
             admin_group: Die Gruppe der Administratoren des Repositoriums kann nicht entfernt werden
           permission_update_errors:
@@ -133,7 +134,7 @@ de:
             no_delay: Keine Verzögerung - Freigabe aller Arbeiten, sobald sie hinterlegt sind
             title: Freigabe
             varies:
-              any: Dem Einzahler erlauben, sich zu entscheiden
+              any: Dem Deponierer erlauben, sich zu entscheiden
               between: Zwischen "jetzt" und
               description: 'Variabel - Deponenten können den Freigabedatum für eine einzelne Arbeit festlegen:'
               embargo:
@@ -142,6 +143,7 @@ de:
                 3yrs: 3 Jahre nach der Deponierung
                 6mos: 6 Monate nach der Deponierung
                 select: Wählen Sie die Sperrfrist aus.
+              period: 'Der Einlieferer kann eine Embargo-Frist bis zu:'
           visibility:
             description: 'Nach dem Release-Datum können die Arbeiten in diesem Admin-Set eingesehen und heruntergeladen werden durch:'
             everyone: Jeder - alle Arbeiten in diesem Admin-Set werden öffentlich sein
@@ -170,8 +172,8 @@ de:
         index:
           action: Aktion
           description: Beschreibung
-          feature: Charakteristisch
-          header: Charakteristik
+          feature: Features
+          header: Features
       sidebar:
         activity: Aktivität
         admin_sets: Admin-Sets
@@ -431,6 +433,7 @@ de:
           works_in_collection: Arbeiten in dieser Sammlung
       create_work: Arbeien erstellen
       current_proxies: Aktuelle Proxies
+      delete_notification: Benachrichtigung löschen
       heading_actions:
         close: Schließen
         create_work: Arbeit erstellen
@@ -482,6 +485,7 @@ de:
       no_transfer_requests: Sie haben keine Arbeitsübertragungsanforderungen erhalten
       no_transfers: Sie haben keine Arbeit übertragen
       proxy_activity: Proxy-Aktivität
+      proxy_delete: Proxy löschen
       proxy_user: Proxy-Benutzer
       show_admin:
         new_visitors: Neue Besucher

data/config/locales/hyrax.en.yml

@@ -71,6 +71,7 @@ en:
           header:         "Edit Administrative Set"
         form:
           cancel:               "Cancel"
+          note:                 "Users granted a new role will only gain the role on works that are deposited after that role has been granted."
           permission_destroy_errors:
             admin_group:        "The repository administrators group cannot be removed"
           permission_update_notices:
@@ -124,16 +125,17 @@ en:
           current_participants: "Current Participants"
         form_visibility:
           cancel:               "Cancel"
-          page_description:     "Release and visibility settings control when works added to this set are made available for discovery and download and who can discover and download them."
+          page_description:     "Release and visibility settings determine the options available to depositors when submitting a work to this administrative set. Changes to these settings do not affect previously deposited works."
           release:
-            description:        "You can impose a delay (embargo) before works in this administrative set are released for discovery and download."
-            fixed:              "Fixed -- delay release of all works until"
-            no_delay:           "No delay -- release all works as soon as they are deposited"
+            description:        "Set embargoes and lease polices for this administrative set."
+            fixed:              "Depositor must choose embargo -- delay release of all works until"
+            no_delay:           "Do not allow embargoes or leases"
             title:              "Release"
             varies:
-              any:              "Allow depositor to decide"
-              between:          "Between \"now\" and"
-              description:      "Varies -- depositors can set the release date for an individual work:"
+              any:              "Depositor can choose any embargo length; leases are allowed"
+              between:          "Depositor can choose embargo up to date:"
+              period:           "Depositor can choose embargo period up to:"
+              description:      "Allow depositor to choose settings:"
               embargo:
                 1yr:            "1 year after deposit"
                 2yrs:           "2 years after deposit"
@@ -141,12 +143,12 @@ en:
                 6mos:           "6 months after deposit"
                 select:         "Select embargo period.."
           visibility:
-            description:        "After its release date, works in this set can be discovered and downloaded by:"
-            everyone:           "Everyone -- all works in this set will be public"
-            institution:        "Institution -- all works will be visible only to authenticated users of this institution"
-            restricted:         "Restricted -- all works will be visible only to repository managers and managers and reviewers of this administrative set"
+            description:        "Set visibility policies for the administrative set. Setting honors embargo policies above."
+            everyone:           "Public - depositor can only choose public visibility setting"
+            institution:        "Institution -- depositor can only select institution visibility setting"
+            restricted:         "Private -- depositor can only select private for visibility. Access is restricted to repository administrators, managers, and viewers of the set. Must be used with \"No embargo\" setting above."
             title:              "Visibility"
-            varies:             "Varies -- default is public, but depositors can restrict the visibility of individual works"
+            varies:             "All settings allowed -- depositor can choose. Must use this option to allow leases."
         form_workflow:
           cancel:               "Cancel"
           no_workflows:         "There are no workflows to select."
@@ -462,10 +464,12 @@ en:
         works:        "Your Works"
       no_activity:              "User has no recent activity"
       no_notifications:         "User has no notifications"
+      delete_notification:      "Delete Notification"
       no_transfer_requests:     "You haven't received any work transfer requests"
       no_transfers:             "You haven't transferred any work"
       proxy_activity:           "Proxy Activity"
       proxy_user:               "Proxy User"
+      proxy_delete:              "Delete Proxy"
       show_admin:
         new_visitors:       "New Visitors"
         registered_users:   "Registered users"

data/config/locales/hyrax.es.yml

@@ -72,6 +72,7 @@ es:
           header: Editar Conjunto Administrativo
         form:
           cancel: Cancelar
+          note: Los usuarios a los que se les otorgue un nuevo rol solo obtendrán el rol en los trabajos que se depositen después de que se haya otorgado ese rol.
           permission_destroy_errors:
             admin_group: No se puede eliminar el grupo de administradores del repositorio
           permission_update_errors:
@@ -142,6 +143,7 @@ es:
                 3yrs: Tres años después del depósito
                 6mos: Seis meses después del depósito
                 select: Seleccione el período de embargo...
+              period: 'El depositante puede elegir un período de embargo hasta:'
           visibility:
             description: 'Después de su fecha de lanzamiento, los trabajos de este conjunto pueden ser descubiertos y descargados por:'
             everyone: Todos -- todos los trabajos de este conjunto serán públicos.
@@ -426,6 +428,7 @@ es:
           works_in_collection: Trabajos en esta colección
       create_work: Crear Trabajo
       current_proxies: Proxies actuales
+      delete_notification: Eliminar notificación
       heading_actions:
         close: Cerrar
         create_work: Crear trabajo
@@ -477,6 +480,7 @@ es:
       no_transfer_requests: No ha recibido ninguna petición de transferencia
       no_transfers: No ha transferido ningún trabajo
       proxy_activity: Actividad de Proxy
+      proxy_delete: Eliminar proxy
       proxy_user: Usuario de Proxy
       show_admin:
         new_visitors: Visitantes Nuevos

data/config/locales/hyrax.fr.yml

@@ -72,6 +72,7 @@ fr:
           header: Modifier l'ensemble administratif
         form:
           cancel: Annuler
+          note: Les utilisateurs auxquels un nouveau rôle est attribué n'acquièrent un rôle que sur les œuvres déposées après l'attribution de ce rôle.
           permission_destroy_errors:
             admin_group: Le groupe des administrateurs du référentiel ne peut pas être supprimé
           permission_update_errors:
@@ -142,6 +143,7 @@ fr:
                 3yrs: 3 ans après le dépôt
                 6mos: 6 mois après le dépôt
                 select: Sélectionnez la période d'embargo ...
+              period: 'Le déposant peut choisir la période d''embargo jusqu''à:'
           visibility:
             description: 'Après sa date de sortie, les travaux de cet ensemble peuvent être découverts et téléchargés par:'
             everyone: Tout le monde - tout fonctionne dans cet ensemble sera public
@@ -431,6 +433,7 @@ fr:
           works_in_collection: Fonctionne dans cette collection
       create_work: Créer un travail
       current_proxies: Proxies actuelles
+      delete_notification: Supprimer la notification
       heading_actions:
         close: Fermer
         create_work: Créer un travail
@@ -482,6 +485,7 @@ fr:
       no_transfer_requests: Vous n'avez reçu aucune demande de transfert de travail
       no_transfers: Vous n'avez transféré aucun travail
       proxy_activity: Activité de procuration
+      proxy_delete: Supprimer le proxy
       proxy_user: Utilisateur proxy
       show_admin:
         new_visitors: Nouveaux visiteurs

data/config/locales/hyrax.it.yml

@@ -72,6 +72,7 @@ it:
           header: Modifica impostazione amministrativa
         form:
           cancel: Annulla
+          note: Gli utenti che hanno assegnato un nuovo ruolo avranno solo il ruolo di opere che vengono depositate dopo che tale ruolo è stato concesso.
           permission_destroy_errors:
             admin_group: Impossibile rimuovere il gruppo amministratori di repository
           permission_update_errors:
@@ -142,6 +143,7 @@ it:
                 3yrs: 3 anni dopo il deposito
                 6mos: 6 mesi dopo il deposito
                 select: Seleziona il periodo di embargo ..
+              period: 'Depositor può scegliere il periodo di embargo fino a:'
           visibility:
             description: 'Dopo la data di rilascio, i lavori in questo set possono essere scoperti e scaricati da:'
             everyone: Tutti - tutti i lavori in questo set saranno pubblici
@@ -431,6 +433,7 @@ it:
           works_in_collection: Funziona in questa collezione
       create_work: Crea lavoro
       current_proxies: Proxy attuali
+      delete_notification: Elimina notifica
       heading_actions:
         close: Vicino
         create_work: Crea lavoro
@@ -482,6 +485,7 @@ it:
       no_transfer_requests: Non hai ricevuto richieste di trasferimento di lavoro
       no_transfers: Non hai trasferito alcun lavoro
       proxy_activity: Attività proxy
+      proxy_delete: Elimina proxy
       proxy_user: Utente Proxy
       show_admin:
         new_visitors: Nuovi visitatori

data/config/locales/hyrax.pt-BR.yml

@@ -72,6 +72,7 @@ pt-BR:
           header: Editar Conjunto Administrativo
         form:
           cancel: Cancelar
+          note: Os usuários que receberam uma nova função só ganharão o papel nas obras que são depositadas depois que essa função foi concedida.
           permission_destroy_errors:
             admin_group: O grupo de administradores do repositório não pode ser removido
           permission_update_errors:
@@ -142,6 +143,7 @@ pt-BR:
                 3yrs: 3 anos após o depósito
                 6mos: 6 meses após o depósito
                 select: Selecione o período de embargo ...
+              period: 'O depositante pode escolher o período de embargo até:'
           visibility:
             description: 'Após a data de lançamento, os trabalhos deste conjunto podem ser descobertos e baixados por:'
             everyone: Todos - todos os trabalhos neste conjunto serão públicos
@@ -431,6 +433,7 @@ pt-BR:
           works_in_collection: Funciona nesta coleção
       create_work: Criar trabalho
       current_proxies: Proxies atuais
+      delete_notification: Eliminar Notificação
       heading_actions:
         close: Fechar
         create_work: Criar trabalho
@@ -482,6 +485,7 @@ pt-BR:
       no_transfer_requests: Você não recebeu nenhum pedido de transferência de trabalho
       no_transfers: Você não transferiu nenhum trabalho
       proxy_activity: Atividade de proxy
+      proxy_delete: Eliminar Proxy
       proxy_user: Usuário Proxy
       show_admin:
         new_visitors: Novos visitantes

data/config/locales/hyrax.zh.yml

@@ -78,6 +78,7 @@ zh:
           header: 编辑管理集
         form:
           cancel: 取消
+          note: 授予新角色的用户只能在授予该角色后存储的作品获得角色。
           permission_destroy_errors:
             admin_group: 无法删除存储库管理员组
           permission_update_errors:
@@ -148,6 +149,7 @@ zh:
                 3yrs: 存储三年之后
                 6mos: 存储六个月之后
                 select: 选择时滞期限..
+              period: 存款人可以选择禁运期限：
           visibility:
             description: '发布日期之后, 管理集内的作品可以被发现和下载:'
             everyone: 每个人 -- 管理集内的所有作品会公开
@@ -432,6 +434,7 @@ zh:
           works_in_collection: 在这个集合的作品
       create_work: 创建作品
       current_proxies: 目前代理
+      delete_notification: 删除通知
       heading_actions:
         close: 关闭
         create_work: 创建作品
@@ -483,6 +486,7 @@ zh:
       no_transfer_requests: 您没有收到任何在作品转让请求
       no_transfers: 您没有转让任何作品
       proxy_activity: 代理活动
+      proxy_delete: 删除代理
       proxy_user: 代理用户
       show_admin:
         new_visitors: 新访问者