From b3e98a2dd271a8abfec866ad04eeb3b27850f4a6 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Fri, 15 Apr 2011 12:08:56 +0000
Subject: merge r10380 from trunk to branch 2.2 feature:2264 Modify triggers
 for prefilters: there is now two triggers. Order prefilters by alphabetic
 order.

git-svn-id: http://piwigo.org/svn/branches/2.2@10381 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/batch_manager.php                            |  2 +-
 admin/batch_manager_global.php                     | 22 ++++++++++++++++++++++
 .../default/template/batch_manager_global.tpl      | 13 ++-----------
 3 files changed, 25 insertions(+), 12 deletions(-)

(limited to 'admin')

diff --git a/admin/batch_manager.php b/admin/batch_manager.php
index 20446e5d4..b333ca9ac 100644
--- a/admin/batch_manager.php
+++ b/admin/batch_manager.php
@@ -250,7 +250,7 @@ SELECT id
       );
   }
 
-  $filter_sets = trigger_event('bulk_manager_prefilter', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']);
+  $filter_sets = trigger_event('perform_batch_manager_prefilters', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']);
 }
 
 if (isset($_SESSION['bulk_manager_filter']['category']))
diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
index 93f8ffa6c..11cafe02d 100644
--- a/admin/batch_manager_global.php
+++ b/admin/batch_manager_global.php
@@ -404,8 +404,30 @@ $template->set_filenames(array('batch_manager_global' => 'batch_manager_global.t
 
 $base_url = get_root_url().'admin.php';
 
+$prefilters = array();
+
+array_push($prefilters,
+  array('ID' => 'caddie', 'NAME' => l10n('caddie')),
+  array('ID' => 'last import', 'NAME' => l10n('last import')),
+  array('ID' => 'with no album', 'NAME' => l10n('with no album')),
+  array('ID' => 'with no tag', 'NAME' => l10n('with no tag')),
+  array('ID' => 'duplicates', 'NAME' => l10n('duplicates')),
+  array('ID' => 'all photos', 'NAME' => l10n('All'))
+);
+
+if ($conf['enable_synchronization'])
+{
+  array_push($prefilters,
+    array('ID' => 'with no virtual album', 'NAME' => l10n('with no virtual album'))
+  );
+}
+
+$prefilters = trigger_event('get_batch_manager_prefilters', $prefilters);
+usort($prefilters, 'UC_name_compare');
+
 $template->assign(
   array(
+    'prefilters' => $prefilters,
     'filter' => $_SESSION['bulk_manager_filter'],
     'selection' => $collection,
     'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')),
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 5c54eec1b..cce2b74c8 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -330,17 +330,8 @@ jQuery(window).load(function() {
         <input type="checkbox" name="filter_prefilter_use" class="useFilterCheckbox" {if isset($filter.prefilter)}checked="checked"{/if}>
         {'predefined filter'|@translate}
         <select name="filter_prefilter">
-          <option value="caddie" {if $filter.prefilter eq 'caddie'}selected="selected"{/if}>{'caddie'|@translate}</option>
-          <option value="last import" {if $filter.prefilter eq 'last import'}selected="selected"{/if}>{'last import'|@translate}</option>
-          <option value="with no album" {if $filter.prefilter eq 'with no album'}selected="selected"{/if}>{'with no album'|@translate}</option>
-{if $ENABLE_SYNCHRONIZATION}
-          <option value="with no virtual album" {if $filter.prefilter eq 'with no virtual album'}selected="selected"{/if}>{'with no virtual album'|@translate}</option>
-{/if}
-          <option value="with no tag" {if $filter.prefilter eq 'with no tag'}selected="selected"{/if}>{'with no tag'|@translate}</option>
-          <option value="duplicates" {if $filter.prefilter eq 'duplicates'}selected="selected"{/if}>{'duplicates'|@translate}</option>
-          <option value="all photos" {if $filter.prefilter eq 'all photos'}selected="selected"{/if}>{'All'|@translate}</option>
-          {foreach from=$bulk_manager_plugins_prefilters item=plugin_prefilter}
-          <option value="{$plugin_prefilter.ID}" {if $filter.prefilter eq $plugin_prefilter.ID}selected="selected"{/if}>{$plugin_prefilter.NAME}</option>
+          {foreach from=$prefilters item=prefilter}
+          <option value="{$prefilter.ID}" {if $filter.prefilter eq $prefilter.ID}selected="selected"{/if}>{$prefilter.NAME}</option>
           {/foreach}
         </select>
       </li>
-- 
cgit v1.2.3