feature 1906: report the "use the album defined sort order" in the ne…

…w Batch Manager. git-svn-id: http://piwigo.org/svn/trunk@8397 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Dec 30, 2010 · 884437a · 884437a
1 parent 7ce257c
commit 884437a
Showing 1 changed file with 36 additions and 5 deletions.
diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
@@ -430,9 +430,9 @@
 ;';
 display_select_cat_wrapper($query, $selected_category, 'filter_category_options', true);
 
-// Dissociate from a category : categories listed for dissociation can
-// only represent virtual links. Links to physical categories can't be
-// broken
+// Dissociate from a category : categories listed for dissociation can only
+// represent virtual links. We can't create orphans. Links to physical
+// categories can't be broken.
 if (count($page['cat_elements_id']) > 0)
 {
   $query = '
@@ -527,10 +527,41 @@
     );
   $template->assign('navbar', $nav_bar);
 
+  $is_category = false;
+  if (isset($_SESSION['bulk_manager_filter']['category'])
+      and !isset($_SESSION['bulk_manager_filter']['category_recursive']))
+  {
+    $is_category = true;
+  }
+
   $query = '
 SELECT id,path,tn_ext,file,filesize,level,name
-  FROM '.IMAGES_TABLE.'
-  WHERE id IN ('.implode(',', $page['cat_elements_id']).')
+  FROM '.IMAGES_TABLE;
+
+  if ($is_category)
+  {
+    $category_info = get_cat_info($_SESSION['bulk_manager_filter']['category']);
+
+    $conf['order_by'] = $conf['order_by_inside_category'];
+    if (!empty($category_info['image_order']))
+    {
+      $conf['order_by'] = ' ORDER BY '.$category_info['image_order'];
+    }
+
+    $query.= '
+    JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id';
+  }
+
+  $query.= '
+  WHERE id IN ('.implode(',', $page['cat_elements_id']).')';
+
+  if ($is_category)
+  {
+    $query.= '
+    AND category_id = '.$_SESSION['bulk_manager_filter']['category'];
+  }
+
+  $query.= '
   '.$conf['order_by'].'
   LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].'
 ;';