From 03d57e28c19f8f70b85c6b887374094a89f3856a Mon Sep 17 00:00:00 2001
From: Daniel Berthereau <Daniel.github@Berthereau.net>
Date: Mon, 21 May 2018 00:00:00 +0200
Subject: [PATCH] Genericized batch actions js for browse pages.

---
 application/asset/js/global.js                     |  2 +-
 application/view/omeka/admin/item-set/browse.phtml | 14 +++++++-------
 application/view/omeka/admin/item/browse.phtml     | 14 +++++++-------
 application/view/omeka/admin/media/browse.phtml    | 14 +++++++-------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/application/asset/js/global.js b/application/asset/js/global.js
index 92e17ef87c..9c2069488a 100644
--- a/application/asset/js/global.js
+++ b/application/asset/js/global.js
@@ -188,7 +188,7 @@ var Omeka = {
     },
 
     manageSelectedActions: function() {
-        var selectedOptions = $('[value="update-selected"], [value="delete-selected"]');
+        var selectedOptions = $('#batch-form .batch-inputs [data-select=selected]');
         if ($('.batch-edit td input[type="checkbox"]:checked').length > 0) {
             selectedOptions.removeAttr('disabled');
         } else {
diff --git a/application/view/omeka/admin/item-set/browse.phtml b/application/view/omeka/admin/item-set/browse.phtml
index 16364fa13c..9448baaabc 100644
--- a/application/view/omeka/admin/item-set/browse.phtml
+++ b/application/view/omeka/admin/item-set/browse.phtml
@@ -50,22 +50,22 @@ $userIsAllowedBatchDelete = $this->userIsAllowed('Omeka\Api\Adapter\ItemSetAdapt
 ?>
 <form method="post" id="batch-form" class="disable-unsaved-warning">
     <div class="batch-inputs">
-        <select class="batch-actions-select" aria-label="<?php echo $translate('Batch actions'); ?>">
+        <select class="batch-actions-select" name="batch_action" aria-label="<?php echo $translate('Batch actions'); ?>">
             <option value="default"><?php echo $translate('Batch actions'); ?></option>
             <?php if ($userIsAllowedBatchUpdate): ?>
-            <option value="update-selected" disabled><?php echo $translate('Edit selected'); ?></option>
-            <option value="update-all"><?php echo $translate('Edit all'); ?></option>
+            <option value="update-selected" data-select="selected" disabled><?php echo $translate('Edit selected'); ?></option>
+            <option value="update-all" data-select="all"><?php echo $translate('Edit all'); ?></option>
             <?php endif; ?>
             <?php if ($userIsAllowedBatchDelete): ?>
-            <option value="delete-selected" disabled><?php echo $translate('Delete selected'); ?></option>
-            <option value="delete-all"><?php echo $translate('Delete all'); ?></option>
+            <option value="delete-selected" data-select="selected" disabled><?php echo $translate('Delete selected'); ?></option>
+            <option value="delete-all" data-select="all"><?php echo $translate('Delete all'); ?></option>
             <?php endif; ?>
         </select>
         <div class="batch-actions">
             <button type="button" class="default active" disabled><?php echo $translate('Go'); ?></button>
             <?php if ($userIsAllowedBatchUpdate): ?>
-            <input type="submit" class="update-selected" name="update_selected" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit'], true)); ?>">
-            <input type="submit" class="update-all" name="update_all" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit-all'], true)); ?>">
+            <input type="submit" class="update-selected" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit'], true)); ?>">
+            <input type="submit" class="update-all" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit-all'], true)); ?>">
             <?php endif; ?>
             <input type="hidden" name="query" class="batch-query" value="<?php echo $escape(json_encode($this->params()->fromQuery())); ?>">
             <?php if ($userIsAllowedBatchDelete): ?>
diff --git a/application/view/omeka/admin/item/browse.phtml b/application/view/omeka/admin/item/browse.phtml
index bd6040e24a..e764d792bc 100644
--- a/application/view/omeka/admin/item/browse.phtml
+++ b/application/view/omeka/admin/item/browse.phtml
@@ -50,22 +50,22 @@ $userIsAllowedBatchDelete = $this->userIsAllowed('Omeka\Api\Adapter\ItemAdapter'
 ?>
 <form method="post" id="batch-form" class="disable-unsaved-warning">
     <div class="batch-inputs">
-        <select class="batch-actions-select" aria-label="<?php echo $translate('Batch actions'); ?>">
+        <select class="batch-actions-select" name="batch_action" aria-label="<?php echo $translate('Batch actions'); ?>">
             <option value="default"><?php echo $translate('Batch actions'); ?></option>
             <?php if ($userIsAllowedBatchUpdate): ?>
-            <option value="update-selected" disabled><?php echo $translate('Edit selected'); ?></option>
-            <option value="update-all"><?php echo $translate('Edit all'); ?></option>
+            <option value="update-selected" data-select="selected" disabled><?php echo $translate('Edit selected'); ?></option>
+            <option value="update-all" data-select="all"><?php echo $translate('Edit all'); ?></option>
             <?php endif; ?>
             <?php if ($userIsAllowedBatchDelete): ?>
-            <option value="delete-selected" disabled><?php echo $translate('Delete selected'); ?></option>
-            <option value="delete-all"><?php echo $translate('Delete all'); ?></option>
+            <option value="delete-selected" data-select="selected" disabled><?php echo $translate('Delete selected'); ?></option>
+            <option value="delete-all" data-select="all"><?php echo $translate('Delete all'); ?></option>
             <?php endif; ?>
         </select>
         <div class="batch-actions">
             <button type="button" class="default active" disabled><?php echo $translate('Go'); ?></button>
             <?php if ($userIsAllowedBatchUpdate): ?>
-            <input type="submit" class="update-selected" name="update_selected" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit'], true)); ?>">
-            <input type="submit" class="update-all" name="update_all" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit-all'], true)); ?>">
+            <input type="submit" class="update-selected" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit'], true)); ?>">
+            <input type="submit" class="update-all" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit-all'], true)); ?>">
             <?php endif; ?>
             <input type="hidden" name="query" class="batch-query" value="<?php echo $escape(json_encode($this->params()->fromQuery())); ?>">
             <?php if ($userIsAllowedBatchDelete): ?>
diff --git a/application/view/omeka/admin/media/browse.phtml b/application/view/omeka/admin/media/browse.phtml
index 5367ecaf3c..57d4bd136f 100644
--- a/application/view/omeka/admin/media/browse.phtml
+++ b/application/view/omeka/admin/media/browse.phtml
@@ -48,22 +48,22 @@ $userIsAllowedBatchDelete = $this->userIsAllowed('Omeka\Api\Adapter\MediaAdapter
 ?>
 <form method="post" id="batch-form" class="disable-unsaved-warning">
     <div class="batch-inputs">
-        <select class="batch-actions-select" aria-label="<?php echo $translate('Batch actions'); ?>">
+        <select class="batch-actions-select" name="batch_action" aria-label="<?php echo $translate('Batch actions'); ?>">
             <option value="default"><?php echo $translate('Batch actions'); ?></option>
             <?php if ($userIsAllowedBatchUpdate): ?>
-            <option value="update-selected" disabled><?php echo $translate('Edit selected'); ?></option>
-            <option value="update-all"><?php echo $translate('Edit all'); ?></option>
+            <option value="update-selected" data-select="selected" disabled><?php echo $translate('Edit selected'); ?></option>
+            <option value="update-all" data-select="all"><?php echo $translate('Edit all'); ?></option>
             <?php endif; ?>
             <?php if ($userIsAllowedBatchDelete): ?>
-            <option value="delete-selected" disabled><?php echo $translate('Delete selected'); ?></option>
-            <option value="delete-all"><?php echo $translate('Delete all'); ?></option>
+            <option value="delete-selected" data-select="selected" disabled><?php echo $translate('Delete selected'); ?></option>
+            <option value="delete-all" data-select="all"><?php echo $translate('Delete all'); ?></option>
             <?php endif; ?>
         </select>
         <div class="batch-actions">
             <button type="button" class="default active" disabled><?php echo $translate('Go'); ?></button>
             <?php if ($userIsAllowedBatchUpdate): ?>
-            <input type="submit" class="update-selected" name="update_selected" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit'], true)); ?>">
-            <input type="submit" class="update-all" name="update_all" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit-all'], true)); ?>">
+            <input type="submit" class="update-selected" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit'], true)); ?>">
+            <input type="submit" class="update-all" value="<?php echo $translate('Go'); ?>" formaction="<?php echo $escape($this->url(null, ['action' => 'batch-edit-all'], true)); ?>">
             <?php endif; ?>
             <input type="hidden" name="query" class="batch-query" value="<?php echo $escape(json_encode($this->params()->fromQuery())); ?>">
             <?php if ($userIsAllowedBatchDelete): ?>