Changeset 28490

Timestamp:

May 17, 2014, 7:58:07 AM (10 years ago)

Author:

rvelices

Message:

• dont't invalidate_user_cache on batch manager refresh photo set or add/remove caddie or generate/delete derivatives
• removed double sql query from batch_manager_global

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• admin/batch_manager_global.php (modified) (3 diffs)
• admin/batch_manager_unit.php (modified) (3 diffs)

trunk/admin.php

@@ -271 +271 @@
           'cat_move',
           'cat_options',  // public/private; lock/unlock
-          'batch_manager',  // associate/dissociate; delete; set level
           'user_list',    // group assoc; user level
           'user_perm',

trunk/admin/batch_manager_global.php

@@ -87 +87 @@
 
   $action = $_POST['selectAction'];
+
+  if (!in_array($action, array('remove_from_caddie','add_to_caddie','delete_derivatives','generate_derivatives')))
+  {
+    invalidate_user_cache();
+  }
 
   if ('remove_from_caddie' == $action)
@@ -377 +382 @@
   }
 
-  if ('delete_derivatives' == $action)
+  if ('delete_derivatives' == $action && !empty($_POST['del_derivatives_type']))
   {
     $query='SELECT path,representative_ext FROM '.IMAGES_TABLE.'
@@ -494 +499 @@
 display_select_categories($categories, array(), 'category_full_name_options', true);
 
-display_select_cat_wrapper($query, array(), 'category_parent_options');
+$template->assign('category_parent_options', $template->get_template_vars('category_full_name_options'));
+$template->assign('category_parent_options_selected', array());
 
 // in the filter box, which category to select by default

trunk/admin/batch_manager_unit.php

@@ -117 +117 @@
 
   $page['infos'][] = l10n('Photo informations updated');
+  invalidate_user_cache();
 }
 
@@ -135 +136 @@
   array(
     'U_ELEMENTS_PAGE' => $base_url.get_query_string_diff(array('display','start')),
-    'F_ACTION'=>$base_url.get_query_string_diff(array()),    
+    'F_ACTION'=>$base_url.get_query_string_diff(array()),
     'month_list' => $month_list,
     'level_options' => get_privacy_level_options(),
@@ -193 +194 @@
 SELECT *
   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']))