From a51fdb3cfd79f4d9a45e40c79b6f0d1b7d8947cb Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 16 Mar 2017 15:33:38 +0100 Subject: [PATCH] batch manager: ability to filter on a specific duplicates option example : admin.php?page=batch_manager&filter=prefilter-duplicates-checksum this is to prepare Tour of 2.9 new features --- admin/batch_manager.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/admin/batch_manager.php b/admin/batch_manager.php index 14c62a557..72d7e2414 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -212,7 +212,20 @@ elseif (isset($_GET['filter'])) switch ($type) { case 'prefilter': - $_SESSION['bulk_manager_filter']['prefilter'] = $value; + if (preg_match('/^duplicates-?/', $value)) + { + list(, $duplicate_field) = explode('-', $value, 2); + $_SESSION['bulk_manager_filter']['prefilter'] = 'duplicates'; + + if (in_array($duplicate_field, array('filename', 'checksum', 'date', 'dimensions'))) + { + $_SESSION['bulk_manager_filter']['duplicates_'.$duplicate_field] = true; + } + } + else + { + $_SESSION['bulk_manager_filter']['prefilter'] = $value; + } break; case 'album': case 'category': case 'cat': @@ -392,7 +405,7 @@ SELECT $duplicates_on_fields[] = 'width'; $duplicates_on_fields[] = 'height'; } - + $query = ' SELECT GROUP_CONCAT(id) AS ids