Changeset 10381 for branches

Timestamp:

Apr 15, 2011, 2:08:56 PM (14 years ago)

Author:

patdenice

Message:

merge r10380 from trunk to branch 2.2
feature:2264
Modify triggers for prefilters: there is now two triggers.
Order prefilters by alphabetic order.

Location:

branches/2.2/admin

Files:

• batch_manager.php (modified) (1 diff)
• batch_manager_global.php (modified) (1 diff)
• themes/default/template/batch_manager_global.tpl (modified) (1 diff)

branches/2.2/admin/batch_manager.php

@@ -251 +251 @@
   }
 
-  $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']);
 }
 

branches/2.2/admin/batch_manager_global.php

@@ -405 +405 @@
 $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,

branches/2.2/admin/themes/default/template/batch_manager_global.tpl

@@ -331 +331 @@
         {'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>