Changeset 29598


Ignore:
Timestamp:
09/17/14 19:21:26 (5 years ago)
Author:
mistic100
Message:

featur 3130: change batch_manager_register_filters to trigger_change

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/batch_manager.php

    r29505 r29598  
    162162  } 
    163163 
    164   trigger_notify('batch_manager_register_filters'); 
     164  $_SESSION['bulk_manager_filter'] = trigger_change('batch_manager_register_filters', $_SESSION['bulk_manager_filter']); 
    165165} 
    166166// filters from url 
     
    234234 
    235235    default: 
    236       $_SESSION['bulk_manager_filter'] = trigger_change('batch_manager_url_filter', 
    237         $_SESSION['bulk_manager_filter'], $type, $value); 
     236      $_SESSION['bulk_manager_filter'] = trigger_change('batch_manager_url_filter', $_SESSION['bulk_manager_filter'], $filter); 
    238237      break; 
    239238    } 
     
    392391    } 
    393392    break; 
    394   } 
    395  
    396   $filter_sets = trigger_change('perform_batch_manager_prefilters', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']); 
     393 
     394  default: 
     395    $filter_sets = trigger_change('perform_batch_manager_prefilters', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']); 
     396    break; 
     397  } 
    397398} 
    398399 
     
    514515} 
    515516 
    516 $filter_sets = trigger_change('batch_manager_perform_filters', $filter_sets); 
     517$filter_sets = trigger_change('batch_manager_perform_filters', $filter_sets, $_SESSION['bulk_manager_filter']); 
    517518 
    518519$current_set = array_shift($filter_sets); 
  • trunk/tools/triggers_list.php

    r29505 r29598  
    1010  'name' => 'batch_manager_perform_filters', 
    1111  'type' => 'trigger_change', 
    12   'vars' => array('array', 'filter_sets'), 
     12  'vars' => array('array', 'filter_sets', 'array', 'bulk_manager_filter'), 
    1313  'files' => array('admin\batch_manager.php'), 
    1414  'infos' => 'New in 2.7', 
     
    1616array( 
    1717  'name' => 'batch_manager_register_filters', 
    18   'type' => 'trigger_notify', 
    19   'vars' => array(), 
     18  'type' => 'trigger_change', 
     19  'vars' => array('array', 'bulk_manager_filter'), 
    2020  'files' => array('admin\batch_manager.php'), 
    2121  'infos' => 'New in 2.7', 
     22), 
     23array( 
     24  'name' => 'batch_manager_url_filter', 
     25  'type' => 'trigger_change', 
     26  'vars' => array('array', 'bulk_manager_filter', 'string', 'filter'), 
     27  'files' => array('admin\batch_manager.php'), 
     28  'infos' => 'New in 2.7.', 
    2229), 
    2330array( 
     
    642649  'name' => 'perform_batch_manager_prefilters', 
    643650  'type' => 'trigger_change', 
    644   'vars' => array('array', 'filter_sets', 'string', 'session_prefilter'), 
     651  'vars' => array('array', 'filter_sets', 'string', 'prefilter'), 
    645652  'files' => array('admin\batch_manager.php'), 
    646653), 
     
    897904  'files' => array('include\ws_functions\pwg.users.php'), 
    898905  'infos' => 'New in 2.6.2.', 
    899 ), 
    900 array( 
    901   'name' => 'batch_manager_url_filter', 
    902   'type' => 'trigger_change', 
    903   'vars' => array('array', 'bulk_manager_filter', 'string', 'type', 'string', 'value'), 
    904   'files' => array('admin\batch_manager.php'), 
    905   'infos' => 'New in 2.7.', 
    906906), 
    907907); 
Note: See TracChangeset for help on using the changeset viewer.