Merge pull request #938 from alphagov/fix-bulk-actions

Fix enabling/disabling of signature bulk actions in admin view
alphagov · May 28, 2024 · e49b488 · e49b488
2 parents f734eb6 + fd0442f
commit e49b488
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/app/assets/stylesheets/petitions/_basic.scss b/app/assets/stylesheets/petitions/_basic.scss
@@ -88,7 +88,6 @@ input[type="search"] {
     box-sizing: content-box;
 }
 input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: searchfield-cancel-button;
   margin-right: 2px;
 }
 

diff --git a/app/views/admin/archived/signatures/_signature.html.erb b/app/views/admin/archived/signatures/_signature.html.erb
@@ -1,7 +1,7 @@
 <tr>
   <td class="petition-id">
     <label>
-      <%= check_box_tag 'id', signature.id, false, disabled: signature.creator? %>
+      <%= check_box_tag 'id', signature.id, false, disabled: signature.creator?, id: dom_id(signature) %>
     </label>
   </td>
   <td class="petition-details">

diff --git a/app/views/admin/archived/signatures/index.html.erb b/app/views/admin/archived/signatures/index.html.erb
@@ -100,7 +100,7 @@
 
         $checked.each(function() {
           var $tr = $(this).closest('tr');
-          var $action = $tr.find('input[type=submit].' + action + '-action');
+          var $action = $tr.find('button.' + action + '-action');
 
           if ($action.length == 0) {
             disabled = true;

diff --git a/app/views/admin/signatures/_signature.html.erb b/app/views/admin/signatures/_signature.html.erb
@@ -1,6 +1,6 @@
 <tr>
   <td class="petition-id">
-    <label><%= check_box_tag 'id', signature.id, false, disabled: signature.creator? %></label>
+    <label><%= check_box_tag 'id', signature.id, false, id: dom_id(signature), disabled: signature.creator? %></label>
   </td>
   <td class="petition-details">
     <p>

diff --git a/app/views/admin/signatures/index.html.erb b/app/views/admin/signatures/index.html.erb
@@ -118,7 +118,7 @@
 
         $checked.each(function() {
           var $tr = $(this).closest('tr');
-          var $action = $tr.find('input[type=submit].' + action + '-action');
+          var $action = $tr.find('button.' + action + '-action');
 
           if ($action.length == 0) {
             disabled = true;