Changeset 9912

Timestamp:

Mar 29, 2011, 11:46:33 AM (13 years ago)

Author:

patdenice

Message:

feature:2236
add "all photos" prefilter

Location:

trunk

Files:

• admin/batch_manager.php (modified) (2 diffs)
• admin/themes/default/template/batch_manager_global.tpl (modified) (2 diffs)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)

trunk/admin/batch_manager.php

@@ -56 +56 @@
   if (isset($_POST['filter_prefilter_use']))
   {
-    $prefilters = array('caddie', 'last import', 'with no album', 'with no tag', 'with no virtual album', 'duplicates');
+    $prefilters = array('caddie', 'last import', 'with no album', 'with no tag', 'with no virtual album', 'duplicates', 'all photos');
     if (in_array($_POST['filter_prefilter'], $prefilters))
     {
@@ -234 +234 @@
   FROM '.IMAGES_TABLE.'
   WHERE file IN (\''.implode("','", $duplicate_files).'\')
+;';
+
+    array_push(
+      $filter_sets,
+      array_from_query($query, 'id')
+      );
+  }
+
+  if ('all photos' == $_SESSION['bulk_manager_filter']['prefilter'])
+  {
+    $query = '
+SELECT id
+  FROM '.IMAGES_TABLE.'
 ;';
 

trunk/admin/themes/default/template/batch_manager_global.tpl

@@ -322 +322 @@
           <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> -->
+          <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>
@@ -328 +328 @@
           <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 photos'|@translate}</option>
         </select>
       </li>

trunk/language/en_UK/admin.lang.php

@@ -778 +778 @@
 $lang['Visit language site'] = 'Visit language site';
 $lang['New Version'] = 'New Version';
+$lang['all photos'] = 'all photos';
 ?>

trunk/language/fr_FR/admin.lang.php

@@ -789 +789 @@
 $lang['Visit language site'] = 'Visitez le site de la langue';
 $lang['New Version'] = 'Nouvelle version';
+$lang['all photos'] = 'toutes les photos';
 ?>