Changeset 28490


Ignore:
Timestamp:
May 17, 2014, 7:58:07 AM (6 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin.php

    r26461 r28490  
    271271          'cat_move',
    272272          'cat_options',  // public/private; lock/unlock
    273           'batch_manager',  // associate/dissociate; delete; set level
    274273          'user_list',    // group assoc; user level
    275274          'user_perm',
  • trunk/admin/batch_manager_global.php

    r28087 r28490  
    8787
    8888  $action = $_POST['selectAction'];
     89
     90  if (!in_array($action, array('remove_from_caddie','add_to_caddie','delete_derivatives','generate_derivatives')))
     91  {
     92    invalidate_user_cache();
     93  }
    8994
    9095  if ('remove_from_caddie' == $action)
     
    377382  }
    378383
    379   if ('delete_derivatives' == $action)
     384  if ('delete_derivatives' == $action && !empty($_POST['del_derivatives_type']))
    380385  {
    381386    $query='SELECT path,representative_ext FROM '.IMAGES_TABLE.'
     
    494499display_select_categories($categories, array(), 'category_full_name_options', true);
    495500
    496 display_select_cat_wrapper($query, array(), 'category_parent_options');
     501$template->assign('category_parent_options', $template->get_template_vars('category_full_name_options'));
     502$template->assign('category_parent_options_selected', array());
    497503
    498504// in the filter box, which category to select by default
  • trunk/admin/batch_manager_unit.php

    r26926 r28490  
    117117
    118118  $page['infos'][] = l10n('Photo informations updated');
     119  invalidate_user_cache();
    119120}
    120121
     
    135136  array(
    136137    'U_ELEMENTS_PAGE' => $base_url.get_query_string_diff(array('display','start')),
    137     'F_ACTION'=>$base_url.get_query_string_diff(array()),   
     138    'F_ACTION'=>$base_url.get_query_string_diff(array()),
    138139    'month_list' => $month_list,
    139140    'level_options' => get_privacy_level_options(),
     
    193194SELECT *
    194195  FROM '.IMAGES_TABLE;
    195  
     196
    196197  if ($is_category)
    197198  {
    198199    $category_info = get_cat_info($_SESSION['bulk_manager_filter']['category']);
    199    
     200
    200201    $conf['order_by'] = $conf['order_by_inside_category'];
    201202    if (!empty($category_info['image_order']))
Note: See TracChangeset for help on using the changeset viewer.