Changeset 7505

Timestamp:

Oct 30, 2010, 10:03:30 PM (13 years ago)

Author:

plg

Message:

merge r7504 from branch 2.1 to trunk

bug 1906 fixed: during batch management, for a given category, use the category
defined sort order for photos, not the generic order_by.

Location:

trunk/admin

Files:

• element_set_global.php (modified) (1 diff)
• element_set_unit.php (modified) (1 diff)

trunk/admin/element_set_global.php

@@ -435 +435 @@
   $query = '
 SELECT id,path,tn_ext,file,filesize,level
-  FROM '.IMAGES_TABLE.'
+  FROM '.IMAGES_TABLE;
+
+  if (is_numeric($_GET['cat']))
+  {
+    $category_info = get_cat_info($_GET['cat']);
+    
+    $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']).')
   '.$conf['order_by'].'

trunk/admin/element_set_unit.php

@@ -195 +195 @@
   $query = '
 SELECT id,path,tn_ext,name,date_creation,comment,author,level,file
-  FROM '.IMAGES_TABLE.'
+  FROM '.IMAGES_TABLE;
+
+  if (is_numeric($_GET['cat']))
+  {
+    $category_info = get_cat_info($_GET['cat']);
+    
+    $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']).')
   '.$conf['order_by'].'