Fixed use without fix omeka/omeka-s#1260.

Daniel-KM · Apr 14, 2019 · 5eb0946 · 5eb0946
1 parent 0bee3d2
commit 5eb0946
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/asset/js/zotero-import.js b/asset/js/zotero-import.js
@@ -1,4 +1,4 @@
-// Kept for compatibility with Omeka < 1.2.
+// Kept as long as pull request #1260 is not passed.
 Omeka.zoteroImportManageSelectedActions = function() {
     var selectedOptions = $('[value="update-selected"], [value="delete-selected"], #batch-form .batch-inputs .batch-selected');
     if ($('.batch-edit td input[type="checkbox"]:checked').length > 0) {
@@ -33,7 +33,7 @@ Omeka.zoteroImportManageSelectedActions = function() {
             $('<input type="hidden" name="resource_type">').val(resourceType)
         );
 
-        // Kept for compatibility with Omeka < 1.2.
+        // Kept as long as pull request #1260 is not passed.
         $('.select-all').change(function() {
             Omeka.zoteroImportManageSelectedActions();
         });

diff --git a/src/Controller/IndexController.php b/src/Controller/IndexController.php
@@ -124,7 +124,7 @@ public function exportAction()
         }
 
         // Set default values to simplify checks.
-        $params += array_fill_keys(['resource_type', 'resource_ids', 'query', 'batch_action', 'zotero_all'], null);
+        $params += array_fill_keys(['resource_type', 'resource_ids', 'query', 'batch_action'], null);
 
         $resourceType = $params['resource_type'];
         $resourceTypeMap = [
@@ -143,7 +143,9 @@ public function exportAction()
             ? (is_array($params['resource_ids']) ? $params['resource_ids'] : explode(',', $params['resource_ids']))
             : [];
         $params['resource_ids'] = $resourceIds;
-        $selectAll = $params['batch_action'] ? $params['batch_action'] === 'zotero-all' : (bool) $params['zotero_all'];
+        // Manage Omeka with or without pull request #1260 (with or without
+        // param batch_action), so check $resourceIds.
+        $selectAll = $params['batch_action'] ? $params['batch_action'] === 'zotero-all' : empty($resourceIds);
         $params['batch_action'] = $selectAll ? 'zotero-all' : 'zotero-selected';
 
         $query = null;