hyrax 2.1.0.rc1 → 2.1.0.rc2

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

@@ -16,7 +16,7 @@
                 <% if row_presenter.admin_set? %>
                   data-path="<%= new_admin_admin_set_path %>"
                 <% else %>
-                  data-path="<%= "#{new_dashboard_collection_path}&collection_type_id=#{row_presenter.id}" %>"
+                  data-path="<%= append_collection_type_url(new_dashboard_collection_path, row_presenter.id) %>"
                 <% end %> />
                 <h4><%= row_presenter.title %></h4>
                 <p><%= row_presenter.description %></p>

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

@@ -33,7 +33,7 @@
         </button>
       <% else @collection_type_list_presenter.any? %>
         <% # link directly to create collection form with type %>
-        <%= link_to(t('helpers.action.collection.new'), "#{new_dashboard_collection_path}&collection_type_id=#{@collection_type_list_presenter.first_collection_type.id}", class: 'btn btn-primary') %>
+        <%= link_to(t('helpers.action.collection.new'), append_collection_type_url(new_dashboard_collection_path, @collection_type_list_presenter.first_collection_type.id), class: 'btn btn-primary') %>
       <% end %>
     <% end %>
   </section>
@@ -41,7 +41,13 @@
   <%# Collections list %>
   <div class="panel panel-default collections-panel-wrapper">
     <div class="panel-heading">
-      <h3 class="panel-title"><strong><%= @response.docs.count %> collections</strong> in the repository</h3>
+      <% if  current_page?(hyrax.my_collections_path(locale: nil)) %>
+        <span class="count-display"><%= I18n.t('hyrax.my.count.collections.you_own', total_count: @response.total_count).html_safe %></span>
+      <% elsif current_page?(hyrax.dashboard_collections_path(locale: nil)) && !current_ability.admin? %>
+        <span class="count-display"><%= I18n.t('hyrax.my.count.collections.you_manage', total_count: @response.total_count).html_safe %></span>
+      <% else %>
+        <span class="count-display"><%= I18n.t('hyrax.my.count.collections.in_repo', total_count: @response.total_count).html_safe %></span>     
+      <% end %>
     </div>
     <div class="panel-body">
       <h2 class="sr-only">Collections listing</h2>

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

@@ -1,5 +1,4 @@
-<ul class="nav nav-tabs" id="my_nav" role="navigation">
-  <span class="sr-only">You are currently listing your works.  You have <%= @response.docs.count %> <%= 'work'.pluralize(@response.docs.count) %> </span>
+<ul class="nav nav-tabs" id="my_nav" role="navigation">	
   <li<%= ' class="active"'.html_safe if current_page?(hyrax.dashboard_works_path(locale: nil)) %>>
     <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path, data: { turbolinks: false } %>
   </li>

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

@@ -54,6 +54,15 @@
   <div class="col-md-12">
     <div class="panel panel-default <%= 'tabs' if current_page?(hyrax.dashboard_works_path(locale: nil)) || @managed_works_count > 0 %>">
       <%= render 'tabs' if current_page?(hyrax.dashboard_works_path(locale: nil)) || @managed_works_count > 0 %>
+      <div class="panel-heading">
+        <% if current_page?(hyrax.my_works_path(locale: nil)) %>
+          <span class="count-display"><%= I18n.t('hyrax.my.count.works.you_own', total_count: @response.total_count).html_safe %></span>
+        <% elsif current_page?(hyrax.dashboard_works_path(locale: nil)) && !current_ability.admin? %>
+          <span class="count-display"><%= I18n.t('hyrax.my.count.works.you_manage', total_count: @response.total_count).html_safe %></span>
+        <% else %>
+          <span class="count-display"><%= I18n.t('hyrax.my.count.works.in_repo', total_count: @response.total_count).html_safe %></span>     
+        <% end %>
+      </div> 
       <div class="panel-body">
         <%= render 'search_header' %>
         <h2 class="sr-only">Works listing</h2>
@@ -65,4 +74,6 @@
   </div>
 </div>
 
+
+
 <%= render '/shared/select_work_type_modal', create_work_presenter: @create_work_presenter if @create_work_presenter.many? %>

data/config/locales/hyrax.de.yml

@@ -174,7 +174,7 @@ de:
           header: Admin-Set
           item_list_header: Arbeiten in diesem Admin-Set
         show_actions:
-          confirm_delete: Möchten Sie dieses Verwaltungsset wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.
+          confirm_delete: Möchten Sie dieses Admin-Set wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.
       appearances:
         show:
           header: Design
@@ -196,7 +196,7 @@ de:
           not_empty: Der Sammlungstyp kann nicht geändert werden, da er Sammlungen enthält
         form:
           tab:
-            appearance: Abzeichen Farbe
+            appearance: Emblemfarbe
             metadata: Beschreibung
             participants: Teilnehmer
             settings: Einstellungen
@@ -602,6 +602,7 @@ de:
             this_collection_in_other_collections: Diese Sammlung in anderen Sammlungen
           modals:
             remove_from_collection_description: Durch das Entfernen dieser Sammlung wird sie nicht aus dem Repository entfernt, sondern nur als übergeordnetes Objekt dieser Sammlung. Möchten Sie diese Sammlung wirklich entfernen?
+            remove_parent_collection_deny: Sie verfügen nicht über ausreichende Berechtigungen, damit die übergeordnete Sammlung entfernt werden kann.
             remove_this_sub_collection_description: Durch das Entfernen dieser Untersammlung wird sie nicht aus dieser übergeordneten Sammlung aus dem Repository entfernt. Möchten Sie diese Untersammlung wirklich entfernen?
           sub_collections_of_collection_description: Diese Sammlungen sind derzeit Untersammlungen dieser Sammlung
           table:
@@ -670,8 +671,8 @@ de:
           add_to_collection_only: Erlaubte Aktionen sind auf das Hinzufügen von Mitgliedern beschränkt
           admin_set_confirmation: Löschen eines Admin-Set von %{application_name} ist dauerhaft. Klicken Sie auf OK, um dieses Admin-Set aus %{application_name} zu löschen, oder auf Abbrechen, um diesen Vorgang abzubrechen
           collection_create_success: Die Sammlung wurde erfolgreich erstellt.
-          collection_delete_fail: Sammlung %{id} konnte nicht gelöscht werden
-          collection_delete_success: Sammlung %{id} wurde erfolgreich gelöscht
+          collection_delete_fail: Sammlung konnte nicht gelöscht werden
+          collection_delete_success: Sammlung wurde erfolgreich gelöscht
           collection_deny_add_members: Sie verfügen nicht über ausreichende Berechtigungen zum Hinzufügen von Mitgliedern zur Sammlung
           collection_update_success: Die Sammlung wurde erfolgreich aktualisiert.
           collections_confirmation_html: "<span class='pluralized'>Diese Sammlung</span> löschen , wird permanent <span class='pluralized'>diese Sammlung</span> aus dem Repository entfernen. Elemente in <span class='pluralized'>dieser Sammlung</span> verbleiben im Repository. Möchten Sie <span class='pluralized'>diese Sammlung</span> wirklich löschen?"
@@ -705,9 +706,9 @@ de:
           edit_access: 'Bearbeiten der Zugriffsrechte:'
           groups: 'Gruppen:'
           managed_access:
-            deposit: Anzahlung
+            deposit: Deponieren
             manage: Verwalten
-            view: Aussicht
+            view: Ansicht
           users: 'Benutzer:'
         collections: Ihre Sammlungen
         facet_label:
@@ -746,7 +747,7 @@ de:
         removed_relationship: "'%{child_title}' wurde aus '%{parent_title}' entfernt"
       no_activity: Benutzer hat keine aktuellen Aufgaben
       no_notifications: Benutzer hat keine Benachrichtigungen
-      no_proxies: Es sind keine Proxys zugewiesen
+      no_proxies: Es sind keine Vertreter zugewiesen
       no_transfer_requests: Sie haben keine Übertragungsanfragen für Arbeiten erhalten
       no_transfers: Sie haben keine Arbeit übertragen
       proxy_activity: Vertreter-Aktivität
@@ -925,6 +926,16 @@ de:
         single: wurde gespeichert.
         subject: Stapelweises Hochladen abgeschlossen
         title: Dateien erfolgreich hochgeladen
+    my:
+      count:
+        collections:
+          in_repo: "<strong> %{total_count} Sammlungen </ strong> im Repository"
+          you_manage: "<strong> %{total_count} Sammlungen </ strong>, die Sie im Repository verwalten können"
+          you_own: "<strong> %{total_count} Sammlungen </ strong>, die Sie im Repository besitzen"
+        works:
+          in_repo: "<strong> %{total_count} funktioniert </ strong> im Repository"
+          you_manage: "<strong> %{total_count} funktioniert </ strong>, das Sie im Repository verwalten können"
+          you_own: "<strong> %{total_count} funktioniert </ strong>, das Sie im Repository besitzen"
     nav_safety:
       change_tab_message: Möchten Sie diesen Tab wirklich verlassen? Nicht gespeicherte Daten gehen verloren.
     pages:
@@ -1144,7 +1155,7 @@ de:
         allow_multiple_membership: MEHRFACHE MITGLIEDSCHAFT
         assigns_visibility: SICHTBARKEIT
         assigns_workflow: WORKFLOW
-        badge_color: Abzeichen Farbe
+        badge_color: Emblemfarbe
         brandable: HERVORHEBBAR (MARKE)
         description: Typbeschreibung
         discoverable: EINSEHBAR

data/config/locales/hyrax.en.yml

@@ -601,6 +601,7 @@ en:
             this_collection_in_other_collections: This Collection in Other Collections
           modals:
             remove_from_collection_description: Removing this collection will not remove it from the repository, only as a parent of this collection.  Are you sure you want to remove this collection?
+            remove_parent_collection_deny: You do not have sufficient privileges for the parent collection to be able to remove it.
             remove_this_sub_collection_description: Removing this sub-collection will not remove it from the repository, only from this parent collection.  Are you sure you want to remove this sub-collection?
           sub_collections_of_collection_description: These collections are currently sub-collections of this collection
           table:
@@ -669,8 +670,8 @@ en:
           add_to_collection_only: Allowed actions are limited to adding members
           admin_set_confirmation: Deleting an admin set from %{application_name} is permanent. Click OK to delete this admin set from %{application_name}, or Cancel to cancel this operation
           collection_create_success: Collection was successfully created.
-          collection_delete_fail: Collection %{id} could not be deleted
-          collection_delete_success: Collection %{id} was successfully deleted
+          collection_delete_fail: Collection could not be deleted
+          collection_delete_success: Collection was successfully deleted
           collection_deny_add_members: You do not have sufficient privileges to add members to the collection
           collection_update_success: Collection was successfully updated.
           collections_confirmation_html: Deleting <span class='pluralized'>this collection</span> will permanently remove <span class='pluralized'>this collection</span> from the repository.  Items in <span class='pluralized'>this collection</span> will remain in the repository.  Are you sure you want to delete <span class='pluralized'>this collection</span>?
@@ -750,7 +751,7 @@ en:
       no_transfers: You haven't transferred any work
       proxy_activity: Proxy Activity
       proxy_delete: Delete Proxy
-      proxy_help: Select a user who can deposit works on your behalf. You will be the owner of works that this user deposits for you. You can revoke a proxy by clicking the Delete Proxy button.
+      proxy_help: Select a user who can deposit works on your behalf. Both you and your proxy will be able to make changes to these works. You can revoke a proxy by clicking the Delete Proxy button. To revoke their ability to edit a work they previously submitted, remove them from the Sharing tab on each work.
       proxy_user: Proxy User
       show_admin:
         new_visitors: New Visitors
@@ -924,6 +925,16 @@ en:
         single: has been saved.
         subject: Batch upload complete
         title: Files uploaded successfully
+    my:
+      count:
+        collections:
+          in_repo: "<strong>%{total_count} collections</strong> in the repository"
+          you_manage: "<strong>%{total_count} collections</strong> you can manage in the repository"
+          you_own: "<strong>%{total_count} collections</strong> you own in the repository"
+        works:
+          in_repo: "<strong>%{total_count} works</strong> in the repository"
+          you_manage: "<strong>%{total_count} works</strong> you can manage in the repository"
+          you_own: "<strong>%{total_count} works</strong> you own in the repository"
     nav_safety:
       change_tab_message: Are you sure you want to leave this tab?  Any unsaved data will be lost.
     pages:

data/config/locales/hyrax.es.yml

@@ -600,6 +600,7 @@ es:
             this_collection_in_other_collections: Esta colección en otras colecciones
           modals:
             remove_from_collection_description: La eliminación de esta colección no la eliminará del repositorio, solo como padre de esta colección. ¿Seguro que quieres eliminar esta colección?
+            remove_parent_collection_deny: No tiene suficientes privilegios para que la colección principal pueda eliminarla.
             remove_this_sub_collection_description: La eliminación de esta subcolección no la eliminará del repositorio, solo de esta colección principal. ¿Seguro que quieres eliminar esta subcolección?
           sub_collections_of_collection_description: Estas colecciones son actualmente subcolecciones de esta colección
           table:
@@ -668,8 +669,8 @@ es:
           add_to_collection_only: Las acciones permitidas están limitadas a agregar miembros
           admin_set_confirmation: La eliminación de un conjunto de administración de %{application_name} es permanente. Haga clic en Aceptar para eliminar este conjunto de administrador de %{application_name}, o en Cancelar para cancelar esta operación
           collection_create_success: La colección fue creada con éxito.
-          collection_delete_fail: Colección %{id} no se pudo eliminar
-          collection_delete_success: Colección %{id} fue eliminada exitosamente
+          collection_delete_fail: Colección no se pudo eliminar
+          collection_delete_success: Colección fue eliminada exitosamente
           collection_deny_add_members: No tiene suficientes privilegios para agregar miembros a la colección
           collection_update_success: La colección fue actualizada con éxito.
           collections_confirmation_html: Eliminar <span class='pluralized'>esta colección</span> eliminará permanentemente <span class='pluralized'>esta colección</span> del repositorio. Los elementos de <span class='pluralized'>esta colección</span> permanecerán en el repositorio. ¿Seguro que quieres eliminar <span class='pluralized'>esta colección</span> ?
@@ -925,6 +926,16 @@ es:
         single: ha sido guardado.
         subject: Subida en lote completa
         title: Archivos cargados satisfactoriamente
+    my:
+      count:
+        collections:
+          in_repo: "<strong> colecciones %{total_count} </ strong> en el repositorio"
+          you_manage: "<strong> colecciones %{total_count} </ strong> puede administrar en el repositorio"
+          you_own: "<strong> colecciones %{total_count} </ strong> que posee en el repositorio"
+        works:
+          in_repo: "<strong> %{total_count} funciona </ strong> en el repositorio"
+          you_manage: "<strong> %{total_count} funciona </ strong> puedes administrar en el repositorio"
+          you_own: "<strong> %{total_count} funciona </ strong> en el repositorio"
     nav_safety:
       change_tab_message: "¿Seguro que quieres salir de esta pestaña? Cualquier información no guardada se perderá."
     pages:

data/config/locales/hyrax.fr.yml

@@ -601,6 +601,7 @@ fr:
             this_collection_in_other_collections: Cette collection dans d'autres collections
           modals:
             remove_from_collection_description: La suppression de cette collection ne la supprimera pas du référentiel, uniquement en tant que parent de cette collection. Êtes-vous sûr de vouloir supprimer cette collection?
+            remove_parent_collection_deny: Vous n'avez pas les privilèges suffisants pour la collection parent pour pouvoir le supprimer.
             remove_this_sub_collection_description: La suppression de cette sous-collection ne la supprimera pas du référentiel, uniquement à partir de cette collection parent. Êtes-vous sûr de vouloir supprimer cette sous-collection?
           sub_collections_of_collection_description: Ces collections sont actuellement des sous-collections de cette collection
           table:
@@ -669,8 +670,8 @@ fr:
           add_to_collection_only: Les actions autorisées sont limitées à l'ajout de membres
           admin_set_confirmation: La suppression d'un ensemble d'administrateurs à partir de %{application_name} est permanente. Cliquez sur OK pour supprimer cet ensemble d'administrateurs de %{application_name}, ou sur Annuler pour annuler cette opération
           collection_create_success: La collection a été créée avec succès.
-          collection_delete_fail: La collection %{id} n'a pas pu être supprimée
-          collection_delete_success: La collection %{id} a été supprimée avec succès
+          collection_delete_fail: La collection n'a pas pu être supprimée
+          collection_delete_success: La collection a été supprimée avec succès
           collection_deny_add_members: Vous n'avez pas les privilèges suffisants pour ajouter des membres à la collection
           collection_update_success: La collection a été mise à jour avec succès.
           collections_confirmation_html: La suppression de <span class='pluralized'>cette collection</span> supprimera définitivement <span class='pluralized'>cette collection</span> du référentiel. Les éléments de <span class='pluralized'>cette collection</span> resteront dans le référentiel. Êtes-vous sûr de vouloir supprimer <span class='pluralized'>cette collection</span> ?
@@ -924,6 +925,16 @@ fr:
         single: a été enregistré.
         subject: Téléchargement par lots complet
         title: Fichiers téléchargés avec succès
+    my:
+      count:
+        collections:
+          in_repo: "<strong> Collections %{total_count} </ strong> dans le référentiel"
+          you_manage: "<strong> collections %{total_count} </ strong> que vous pouvez gérer dans le référentiel"
+          you_own: "<strong> collections %{total_count} </ strong> que vous possédez dans le référentiel"
+        works:
+          in_repo: "<strong> %{total_count} fonctionne </ strong> dans le référentiel"
+          you_manage: "<strong> %{total_count} fonctionne </ strong> vous pouvez gérer dans le référentiel"
+          you_own: "<strong> %{total_count} fonctionne </ strong> que vous possédez dans le référentiel"
     nav_safety:
       change_tab_message: Êtes-vous sûr de vouloir quitter cet onglet? Toutes les données non enregistrées seront perdues.
     pages:

data/config/locales/hyrax.it.yml

@@ -600,6 +600,7 @@ it:
             this_collection_in_other_collections: Questa collezione in altre collezioni
           modals:
             remove_from_collection_description: La rimozione di questa raccolta non la rimuoverà dal repository, ma solo come genitore di questa raccolta. Sei sicuro di voler rimuovere questa raccolta?
+            remove_parent_collection_deny: Non disponi di privilegi sufficienti per la raccolta principale per poterlo rimuovere.
             remove_this_sub_collection_description: La rimozione di questa sotto-raccolta non la rimuoverà dal repository, solo da questa raccolta genitore. Sei sicuro di voler rimuovere questa sottoraccolta?
           sub_collections_of_collection_description: Queste raccolte sono attualmente sotto-raccolte di questa collezione
           table:
@@ -668,8 +669,8 @@ it:
           add_to_collection_only: Le azioni consentite sono limitate all'aggiunta di membri
           admin_set_confirmation: L'eliminazione di un set di amministratori da %{application_name} è permanente. Fare clic su OK per eliminare questo set di amministratori da %{application_name}, o Annulla per annullare questa operazione
           collection_create_success: La raccolta è stata creata con successo.
-          collection_delete_fail: Collezione %{id} non può essere cancellata
-          collection_delete_success: La raccolta %{id} è stata cancellata con successo
+          collection_delete_fail: Collezione non può essere cancellata
+          collection_delete_success: La raccolta è stata cancellata con successo
           collection_deny_add_members: Non disponi di privilegi sufficienti per aggiungere membri alla raccolta
           collection_update_success: La raccolta è stata aggiornata con successo.
           collections_confirmation_html: L'eliminazione di <span class='pluralized'>questa raccolta</span> rimuove definitivamente <span class='pluralized'>questa raccolta</span> dal repository. Gli articoli di <span class='pluralized'>questa raccolta</span> rimarranno nel repository. Sei sicuro di voler eliminare <span class='pluralized'>questa raccolta</span> ?
@@ -923,6 +924,16 @@ it:
         single: È stato salvato.
         subject: Caricamento batch completato
         title: I file sono stati caricati correttamente
+    my:
+      count:
+        collections:
+          in_repo: "<strong> collezioni %{total_count} </ strong> nel repository"
+          you_manage: "<strong> collezioni %{total_count} </ strong> che puoi gestire nel repository"
+          you_own: "<strong> collezioni %{total_count} </ strong> che possiedi nel repository"
+        works:
+          in_repo: "<strong> %{total_count} funziona </ strong> nel repository"
+          you_manage: "<strong> %{total_count} funziona </ strong> che puoi gestire nel repository"
+          you_own: "<strong> %{total_count} funziona </ strong> nel repository"
     nav_safety:
       change_tab_message: Sei sicuro di voler lasciare questa scheda? Tutti i dati non salvati andranno persi.
     pages:

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

@@ -595,6 +595,7 @@ pt-BR:
             this_collection_in_other_collections: Esta coleção em outras coleções
           modals:
             remove_from_collection_description: A remoção desta coleção não o removerá do repositório, apenas como pai dessa coleção. Tem certeza de que deseja remover essa coleção?
+            remove_parent_collection_deny: Você não tem privilégios suficientes para que a coleção pai possa removê-la.
             remove_this_sub_collection_description: A remoção desta subculpa não a removerá do repositório, apenas a partir dessa coleção original. Tem certeza de que deseja remover essa subculpa?
           sub_collections_of_collection_description: Essas coleções são atualmente sub-coleções desta coleção
           table:
@@ -663,8 +664,8 @@ pt-BR:
           add_to_collection_only: As ações permitidas estão limitadas à adição de membros
           admin_set_confirmation: Excluir um conjunto de administradores de %{application_name} é permanente. Clique em OK para excluir este conjunto de administrador de %{application_name} ou Cancelar para cancelar esta operação
           collection_create_success: A coleção foi criada com sucesso.
-          collection_delete_fail: Coleção %{id} não pôde ser excluída
-          collection_delete_success: Coleção %{id} foi excluída com sucesso
+          collection_delete_fail: Coleção não pôde ser excluída
+          collection_delete_success: Coleção foi excluída com sucesso
           collection_deny_add_members: Você não tem privilégios suficientes para adicionar membros à coleção
           collection_update_success: A coleção foi atualizada com sucesso.
           collections_confirmation_html: A exclusão <span class='pluralized'>dessa coleção</span> removerá permanentemente <span class='pluralized'>essa coleção</span> do repositório. Os itens <span class='pluralized'>desta coleção</span> permanecerão no repositório. Tem certeza de que deseja excluir <span class='pluralized'>esta coleção</span> ?
@@ -918,6 +919,16 @@ pt-BR:
         single: Foi salvo.
         subject: Carregamento em lote completo
         title: Arquivos carregados com sucesso
+    my:
+      count:
+        collections:
+          in_repo: "<strong> coleções %{total_count} </ strong> no repositório"
+          you_manage: "<strong> coleções %{total_count} </ strong> você pode gerenciar no repositório"
+          you_own: "<strong> coleções %{total_count} </ strong> você possui no repositório"
+        works:
+          in_repo: "<strong> %{total_count} funciona </ strong> no repositório"
+          you_manage: "<strong> %{total_count} funciona </ strong> você pode gerenciar no repositório"
+          you_own: "<strong> %{total_count} funciona </ strong> você possui no repositório"
     nav_safety:
       change_tab_message: Sei sicuro di voler lasciare questa scheda? Tutti i dati non salvati andranno persi.
     pages:

data/config/locales/hyrax.zh.yml

@@ -598,6 +598,7 @@ zh:
             this_collection_in_other_collections: 此集合在其他集合中
           modals:
             remove_from_collection_description: 删除此集合不会将其从存储库中删除，只能作为此集合的父项。你确定要删除这个集合吗？
+            remove_parent_collection_deny: 您没有足够的权限让父级集合能够将其删除。
             remove_this_sub_collection_description: 删除此子集合不会将其从存储库中删除，只能从此父集合中删除。你确定要删除这个子集合吗？
           sub_collections_of_collection_description: 这些集合目前是该集合的子集合
           table:
@@ -666,8 +667,8 @@ zh:
           add_to_collection_only: 允许的操作仅限于添加成员
           admin_set_confirmation: 从%{application_name}删除管理员集合是永久性的。单击确定从%{application_name}删除此管理集，或单击取消取消此操作
           collection_create_success: 收集已成功创建。
-          collection_delete_fail: 收藏%{id}无法删除
-          collection_delete_success: 收藏夹%{id}已成功删除
+          collection_delete_fail: 收藏无法删除
+          collection_delete_success: 收藏夹已成功删除
           collection_deny_add_members: 您没有足够的权限将成员添加到集合中
           collection_update_success: 收集已成功更新。
           collections_confirmation_html: 删除<span class='pluralized'>这个集合</span>将永久地从存储库中删除<span class='pluralized'>这个集合</span> 。 <span class='pluralized'>此集合中的</span>项目将保留在存储库中。你确定要删除<span class='pluralized'>这个集合</span>吗？
@@ -921,6 +922,16 @@ zh:
         single: 已保存。
         subject: 批量上传完成
         title: 文件上传成功
+    my:
+      count:
+        collections:
+          in_repo: 存储库中的<strong> %{total_count}集合</ strong>
+          you_manage: 您可以在存储库中管理<strong> %{total_count}集合</ strong>
+          you_own: 您在存储库中拥有<strong> %{total_count}集合</ strong>
+        works:
+          in_repo: 存储库中的<strong> %{total_count}有效</ strong>
+          you_manage: 您可以在存储库中管理<strong> %{total_count}作品</ strong>
+          you_own: 您在存储库中拥有<strong> %{total_count}作品</ strong>
     nav_safety:
       change_tab_message: 你确定要离开这个标签吗？任何未保存的数据都将丢失。
     pages:

data/hyrax.gemspec

@@ -46,7 +46,7 @@ SUMMARY
   spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
   spec.add_dependency 'hydra-derivatives', '~> 3.3'
-  spec.add_dependency 'hydra-editor', '~> 3.3'
+  spec.add_dependency 'hydra-editor', '>= 3.3', '< 5.0'
   spec.add_dependency 'hydra-head', '>= 10.5.0'
   spec.add_dependency 'hydra-works', '~> 0.16'
   spec.add_dependency 'iiif_manifest', '>= 0.3', '< 0.5'

data/lib/generators/hyrax/templates/db/migrate/20170810190549_update_collection_type_column_options.rb.erb

@@ -1,9 +1,17 @@
 class UpdateCollectionTypeColumnOptions < ActiveRecord::Migration<%= migration_version %>
-  def change
+  def up
     change_column :hyrax_collection_types, :title, :string, unique: true
     change_column :hyrax_collection_types, :machine_id, :string, unique: true
 
     remove_index :hyrax_collection_types, :machine_id
     add_index :hyrax_collection_types, :machine_id, unique: true
   end
+
+  def down
+    change_column :hyrax_collection_types, :title, :string
+    change_column :hyrax_collection_types, :machine_id, :string
+
+    remove_index :hyrax_collection_types, :machine_id
+    add_index :hyrax_collection_types, :machine_id
+  end
 end

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.1.0.rc1'.freeze
+  VERSION = '2.1.0.rc2'.freeze
 end

data/spec/controllers/hyrax/dashboard/collections_controller_spec.rb

@@ -251,7 +251,6 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
         }
         expect(response).to be_successful
         expect(response).to render_template(:edit)
-        expect(assigns[:member_docs]).to be_kind_of Array
       end
     end
 
@@ -402,7 +401,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
         delete :destroy, params: { id: collection }
         expect(response).to have_http_status(:found)
         expect(response).to redirect_to(Hyrax::Engine.routes.url_helpers.my_collections_path(locale: 'en'))
-        expect(flash[:notice]).to eq "Collection #{collection.id} was successfully deleted"
+        expect(flash[:notice]).to eq "Collection was successfully deleted"
       end
 
       it "returns json" do
@@ -420,7 +419,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
         delete :destroy, params: { id: collection }
         expect(response).to have_http_status(:unprocessable_entity)
         expect(response).to render_template(:edit)
-        expect(flash[:notice]).to eq "Collection #{collection.id} could not be deleted"
+        expect(flash[:notice]).to eq "Collection could not be deleted"
       end
 
       it "returns json" do

data/spec/features/collection_multi_membership_spec.rb

@@ -11,21 +11,20 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
   end
 
   describe 'when both collections support multiple membership' do
-    let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid) }
+    let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid, title: ['OldCollectionTitle']) }
     let!(:work) { create(:generic_work, user: admin_user, member_of_collections: [old_collection], title: ['The highly valued work that everyone wants in their collection']) }
 
     context 'and are of different types' do
-      let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_2.gid) }
+      let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_2.gid, title: ['NewCollectionTitle']) }
 
       it 'then the work is added to both collections' do
+        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
         # Add to second multi-membership collection of a different type
         visit '/dashboard/my/works'
         check 'check_all'
         click_button 'Add to collection' # opens the modal
-        within('div#collection-list-container') do
-          choose new_collection.title.first # selects the collection
-          click_button 'Save changes'
-        end
+        select_member_of_collection(new_collection)
+        click_button 'Save changes'
 
         # forwards to collection show page
         expect(page).to have_content new_collection.title.first
@@ -36,17 +35,16 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
     end
 
     context 'and are of the same type' do
-      let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid) }
+      let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid, title: ['NewCollectionTitle']) }
 
       it 'then the work is added to both collections' do
+        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
         # Add to second multi-membership collection of a different type
         visit '/dashboard/my/works'
         check 'check_all'
         click_button 'Add to collection' # opens the modal
-        within('div#collection-list-container') do
-          choose new_collection.title.first # selects the collection
-          click_button 'Save changes'
-        end
+        select_member_of_collection(new_collection)
+        click_button 'Save changes'
 
         # forwards to collection show page
         expect(page).to have_content new_collection.title.first
@@ -58,7 +56,7 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
   end
 
   describe 'when both collections require single membership' do
-    let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid) }
+    let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid, title: ['OldCollectionTitle']) }
     let!(:work) do
       create(:generic_work,
              user: admin_user,
@@ -69,17 +67,17 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
     end
 
     context 'and are of different types' do
-      let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_2.gid) }
+      let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_2.gid, title: ['NewCollectionTitle']) }
 
       it 'then the work is added to both collections' do
+        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
         # Add to second single-membership collection of a different type
         visit '/dashboard/my/works'
         check 'check_all'
         click_button 'Add to collection' # opens the modal
-        within('div#collection-list-container') do
-          choose new_collection.title.first # selects the collection
-          click_button 'Save changes'
-        end
+        select_member_of_collection(new_collection)
+        click_button 'Save changes'
+
         # forwards to collection show page
         expect(page).to have_content new_collection.title.first
         expect(page).to have_content 'Works (1)'
@@ -89,18 +87,18 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
     end
 
     context 'and are of the same type' do
-      let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid) }
+      let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid, title: ['NewCollectionTitle']) }
 
       context 'then the work fails to add to the second collection' do
         it 'from the dashboard->works batch add to collection' do
+          optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
           # Attempt to add to second single-membership collection of the same type
           visit '/dashboard/my/works'
           check 'check_all'
           click_button 'Add to collection' # opens the modal
-          within('div#collection-list-container') do
-            choose new_collection.title.first # selects the collection
-            click_button 'Save changes'
-          end
+          select_member_of_collection(new_collection)
+          click_button 'Save changes'
+
           # forwards to collections index page and shows flash message
           within('section.tabs-row') do
             expect(page).to have_link 'All Collections'
@@ -141,7 +139,8 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
           check 'check_all'
           click_button 'Add to collection' # opens the modal
           within('div#collection-list-container') do
-            choose new_collection.title.first # selects the collection
+            expect(page).to have_selector "#member_of_collection_ids[value=\"#{new_collection.id}\"]", visible: false
+            expect(page).to have_selector "#member_of_collection_label[value=\"#{new_collection.title.first}\"]"
             click_button 'Save changes'
           end
           # forwards to collections index page and shows flash message
@@ -162,18 +161,18 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
     let!(:work) { create(:generic_work, user: admin_user, member_of_collections: [old_collection], title: ['The highly valued work that everyone wants in their collection']) }
 
     context 'allowing multi-membership' do
-      let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid) }
+      let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid, title: ['CollectionTitle']) }
       let!(:new_collection) { old_collection }
 
       it 'then the add is treated as a success' do
+        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
         # Re-add to same multi-membership collection
         visit '/dashboard/my/works'
         check 'check_all'
         click_button 'Add to collection' # opens the modal
-        within('div#collection-list-container') do
-          choose new_collection.title.first # selects the collection
-          click_button 'Save changes'
-        end
+        select_member_of_collection(new_collection)
+        click_button 'Save changes'
+
         # forwards to collection show page
         expect(page).to have_content new_collection.title.first
         expect(page).to have_content 'Works (1)'
@@ -183,18 +182,18 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
     end
 
     context 'requiring single-membership' do
-      let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid) }
+      let(:old_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_1.gid, title: ['CollectionTitle']) }
       let!(:new_collection) { old_collection }
 
       it 'then the add is treated as a success' do
+        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
         # Re-add to same single-membership collection
         visit '/dashboard/my/works'
         check 'check_all'
         click_button 'Add to collection' # opens the modal
-        within('div#collection-list-container') do
-          choose new_collection.title.first # selects the collection
-          click_button 'Save changes'
-        end
+        select_member_of_collection(new_collection)
+        click_button 'Save changes'
+
         # forwards to collection show page
         expect(page).to have_content new_collection.title.first
         expect(page).to have_content 'Works (1)'