Merge branch 'main' into embargo-form-fixes

samvera · Nov 8, 2024 · e22b8f1 · e22b8f1
2 parents eb5e528 + 1584e11
commit e22b8f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/indexers/hyrax/indexers/resource_indexer.rb b/app/indexers/hyrax/indexers/resource_indexer.rb
@@ -47,6 +47,7 @@ def to_solr
           "system_modified_dtsi": resource.updated_at,
           "has_model_ssim": resource.to_rdf_representation,
           "human_readable_type_tesim": resource.human_readable_type,
+          "human_readable_type_sim": resource.human_readable_type,
           "alternate_ids_sim": resource.alternate_ids.map(&:to_s)
         }.with_indifferent_access
       end

diff --git a/app/views/hyrax/base/_form_member_of_collections.html.erb b/app/views/hyrax/base/_form_member_of_collections.html.erb
@@ -33,6 +33,10 @@ HTML Properties:
     </tr>
     </thead>
     <tbody>
+      <tr class="sr-only">
+        <td>This table will only display data if works are assigned to collections</td>
+        <td><span></span></td>
+      </tr>
     </tbody>
   </table>
 </div>

diff --git a/app/views/hyrax/leases/_list_expired_active_leases.html.erb b/app/views/hyrax/leases/_list_expired_active_leases.html.erb
@@ -32,17 +32,17 @@
         <tr>
           <td><%= render 'hyrax/batch_select/add_button', document: curation_concern %></td>
           <td class="human-readable-type"><%= curation_concern.human_readable_type %></td>
-          <td class="title"><%= link_to curation_concern, edit_lease_path(curation_concern) %></td>
+          <td class="title"><label for="batch_document_<%= curation_concern.id %>"><%= link_to curation_concern, edit_lease_path(curation_concern) %></label></td>
           <td class="current-visibility"><%= visibility_badge(curation_concern.visibility) %></td>
           <td class="lease-release-date"><%= curation_concern.lease_expiration_date %></td>
           <td class="visibility-after-lease"><%= visibility_badge(curation_concern.visibility_after_lease) %></td>
         </tr>
         <tr data-behavior="extra" data-id="<%= curation_concern.id %>" class="extra-lease-info">
           <td></td>
           <td colspan=4>
-            <%= check_box_tag "leases[#{i}][copy_visibility]", curation_concern.id, true %>
-            <%= t('.change_all', cc: curation_concern) %>
-            <%= visibility_badge(curation_concern.visibility_after_lease) %>?
+            <%= check_box_tag "leases[#{i}][copy_visibility]", curation_concern.id, true, 'aria-labelledby': "leases_#{i}_copy_visibility" %>
+            <label for="leases_<%= i %>_copy_visibility"><%= t('.change_all', cc: curation_concern) %>
+            <%= visibility_badge(curation_concern.visibility_after_lease) %>?</label>
           </td>
           <td class="actions"><%= link_to t('.deactivate'), lease_path(curation_concern), method: :delete, class: 'btn btn-primary' %></td>
         </tr>