Changeset 29065

Timestamp:

Jul 21, 2014, 9:15:53 PM (10 years ago)

Author:

rvelices

Message:

remove tag query from batch manager (not required since selectize uses web service) + query2array

File:

• trunk/admin/batch_manager.php (modified) (15 diffs)

trunk/admin/batch_manager.php

@@ -183 +183 @@
   WHERE user_id = '.$user['id'].'
 ;';
-    $filter_sets[] = array_from_query($query, 'element_id');
+    $filter_sets[] = query2array($query, null, 'element_id');
 
     break;
@@ -193 +193 @@
   WHERE user_id = '.$user['id'].'
 ;';
-    $filter_sets[] = array_from_query($query, 'image_id');
+    $filter_sets[] = query2array($query, null, 'image_id');
 
     break;
@@ -210 +210 @@
   WHERE date_available BETWEEN '.pwg_db_get_recent_period_expression(1, $row['date']).' AND \''.$row['date'].'\'
 ;';
-      $filter_sets[] = array_from_query($query, 'id');
+      $filter_sets[] = query2array($query, null, 'id');
     }
 
@@ -221 +221 @@
    FROM '.IMAGES_TABLE.'
  ;';
-    $all_elements = array_from_query($query, 'id');
+    $all_elements = query2array($query, null, 'id');
 
     $query = '
@@ -228 +228 @@
    WHERE dir IS NULL
  ;';
-    $virtual_categories = array_from_query($query, 'id');
+    $virtual_categories = query2array($query, null, 'id');
     if (!empty($virtual_categories))
     {
@@ -236 +236 @@
    WHERE category_id IN ('.implode(',', $virtual_categories).')
  ;';
-      $linked_to_virtual = array_from_query($query, 'image_id');
+      $linked_to_virtual = query2array($query, null, 'image_id');
     }
 
@@ -251 +251 @@
   WHERE category_id is null
 ;';
-    $filter_sets[] = array_from_query($query, 'id');
+    $filter_sets[] = query2array($query, null, 'id');
 
     break;
@@ -263 +263 @@
   WHERE tag_id is null
 ;';
-    $filter_sets[] = array_from_query($query, 'id');
+    $filter_sets[] = query2array($query, null, 'id');
 
     break;
@@ -278 +278 @@
   HAVING COUNT(*) > 1
 ;';
-    $duplicate_files = array_from_query($query, 'file');
+    $duplicate_files = query2array($query, null, 'file');
 
     $query = '
@@ -285 +285 @@
   WHERE file IN (\''.implode("','", array_map('pwg_db_real_escape_string', $duplicate_files)).'\')
 ;';
-    $filter_sets[] = array_from_query($query, 'id');
+    $filter_sets[] = query2array($query, null, 'id');
 
     break;
@@ -297 +297 @@
   '.$conf['order_by'];
 
-      $filter_sets[] = array_from_query($query, 'id');
+      $filter_sets[] = query2array($query, null, 'id');
     }
     break;
@@ -323 +323 @@
    WHERE category_id IN ('.implode(',', $categories).')
  ;';
-  $filter_sets[] = array_from_query($query, 'image_id');
+  $filter_sets[] = query2array($query, null, 'image_id');
 }
 
@@ -340 +340 @@
   '.$conf['order_by'];
 
-  $filter_sets[] = array_from_query($query, 'id');
+  $filter_sets[] = query2array($query, null, 'id');
 }
 
@@ -389 +389 @@
   '.$conf['order_by'];
 
-  $filter_sets[] = array_from_query($query, 'id');
+  $filter_sets[] = query2array($query, null, 'id');
 }
 
@@ -446 +446 @@
 $tabsheet->select($page['tab']);
 $tabsheet->assign();
-
-
-// +-----------------------------------------------------------------------+
-// |                              tags                                     |
-// +-----------------------------------------------------------------------+
-
-$query = '
-SELECT id, name
-  FROM '.TAGS_TABLE.'
-;';
-$template->assign('tags', get_taglist($query, false));