feature:2236

add "all photos" prefilter

git-svn-id: http://piwigo.org/svn/trunk@9912 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 18 insertions, 2 deletions

diff --git a/admin/batch_manager.php b/admin/batch_manager.php
index fa3720b27..232c84f08 100644
--- a/admin/batch_manager.php
+++ b/admin/batch_manager.php
@@ -55,7 +55,7 @@ if (isset($_POST['submitFilter']))
 
   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))
     {
       $_SESSION['bulk_manager_filter']['prefilter'] = $_POST['filter_prefilter'];
@@ -240,6 +240,19 @@ SELECT id
       array_from_query($query, 'id')
       );
   }
+
+  if ('all photos' == $_SESSION['bulk_manager_filter']['prefilter'])
+  {
+    $query = '
+SELECT id
+  FROM '.IMAGES_TABLE.'
+;';
+
+    array_push(
+      $filter_sets,
+      array_from_query($query, 'id')
+      );
+  }
 }
 
 if (isset($_SESSION['bulk_manager_filter']['category']))
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index e9b09edca..66b51ee38 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -321,12 +321,13 @@ $(document).ready(function() {
         <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> -->
+          <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 photos'|@translate}</option>
         </select>
       </li>
       <li id="filter_category" {if !isset($filter.category)}style="display:none"{/if}>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 1d86a5394..4106449f2 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -777,4 +777,5 @@ $lang['All languages are up to date.'] = 'All languages are up to date.';
 $lang['Visit theme site'] = 'Visit theme site';
 $lang['Visit language site'] = 'Visit language site';
 $lang['New Version'] = 'New Version';
+$lang['all photos'] = 'all photos';
 ?>
\ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index e18123eba..553a3b3a3 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -788,4 +788,5 @@ $lang['All languages are up to date.'] = 'Toutes les langues sont à jour.';
 $lang['Visit theme site'] = 'Visitez le site du thème';
 $lang['Visit language site'] = 'Visitez le site de la langue';
 $lang['New Version'] = 'Nouvelle version';
+$lang['all photos'] = 'toutes les photos';
 ?>