mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-05-06 08:05:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

featur 3130: change batch_manager_register_filters to trigger_change

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@29598 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2014-09-17 17:21:26 +00:00
parent 7478a32fe0
commit 0afaeeef55
2 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
admin/batch_manager.php
View file

@ -161,7 +161,7 @@ if (isset($_POST['submitFilter']))
$_SESSION['bulk_manager_filter']['search']['q'] = $_POST['q']; $_SESSION['bulk_manager_filter']['search']['q'] = $_POST['q'];
} }
trigger_notify('batch_manager_register_filters'); $_SESSION['bulk_manager_filter'] = trigger_change('batch_manager_register_filters', $_SESSION['bulk_manager_filter']);
} }
// filters from url // filters from url
elseif (isset($_GET['filter'])) elseif (isset($_GET['filter']))
@ -233,8 +233,7 @@ elseif (isset($_GET['filter']))
break; break;
default: default:
$_SESSION['bulk_manager_filter'] = trigger_change('batch_manager_url_filter', $_SESSION['bulk_manager_filter'] = trigger_change('batch_manager_url_filter', $_SESSION['bulk_manager_filter'], $filter);
$_SESSION['bulk_manager_filter'], $type, $value);
break; break;
} }
} }
@ -391,9 +390,11 @@ SELECT id
$filter_sets[] = query2array($query, null, 'id'); $filter_sets[] = query2array($query, null, 'id');
} }
break; break;
}
default:
$filter_sets = trigger_change('perform_batch_manager_prefilters', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']); $filter_sets = trigger_change('perform_batch_manager_prefilters', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']);
break;
}
} }
if (isset($_SESSION['bulk_manager_filter']['category'])) if (isset($_SESSION['bulk_manager_filter']['category']))
@ -513,7 +514,7 @@ if (isset($_SESSION['bulk_manager_filter']['search']))
$filter_sets[] = $res['items']; $filter_sets[] = $res['items'];
} }
$filter_sets = trigger_change('batch_manager_perform_filters', $filter_sets); $filter_sets = trigger_change('batch_manager_perform_filters', $filter_sets, $_SESSION['bulk_manager_filter']);
$current_set = array_shift($filter_sets); $current_set = array_shift($filter_sets);
foreach ($filter_sets as $set) foreach ($filter_sets as $set)

22
tools/triggers_list.php
View file

@ -9,17 +9,24 @@ array(
array( array(
'name' => 'batch_manager_perform_filters', 'name' => 'batch_manager_perform_filters',
'type' => 'trigger_change', 'type' => 'trigger_change',
'vars' => array('array', 'filter_sets'), 'vars' => array('array', 'filter_sets', 'array', 'bulk_manager_filter'),
'files' => array('admin\batch_manager.php'), 'files' => array('admin\batch_manager.php'),
'infos' => 'New in 2.7', 'infos' => 'New in 2.7',
), ),
array( array(
'name' => 'batch_manager_register_filters', 'name' => 'batch_manager_register_filters',
'type' => 'trigger_notify', 'type' => 'trigger_change',
'vars' => array(), 'vars' => array('array', 'bulk_manager_filter'),
'files' => array('admin\batch_manager.php'), 'files' => array('admin\batch_manager.php'),
'infos' => 'New in 2.7', 'infos' => 'New in 2.7',
), ),
array(
'name' => 'batch_manager_url_filter',
'type' => 'trigger_change',
'vars' => array('array', 'bulk_manager_filter', 'string', 'filter'),
'files' => array('admin\batch_manager.php'),
'infos' => 'New in 2.7.',
),
array( array(
'name' => 'begin_delete_elements', 'name' => 'begin_delete_elements',
'type' => 'trigger_notify', 'type' => 'trigger_notify',
@ -641,7 +648,7 @@ array(
array( array(
'name' => 'perform_batch_manager_prefilters', 'name' => 'perform_batch_manager_prefilters',
'type' => 'trigger_change', 'type' => 'trigger_change',
'vars' => array('array', 'filter_sets', 'string', 'session_prefilter'), 'vars' => array('array', 'filter_sets', 'string', 'prefilter'),
'files' => array('admin\batch_manager.php'), 'files' => array('admin\batch_manager.php'),
), ),
array( array(
@ -897,13 +904,6 @@ array(
'files' => array('include\ws_functions\pwg.users.php'), 'files' => array('include\ws_functions\pwg.users.php'),
'infos' => 'New in 2.6.2.', 'infos' => 'New in 2.6.2.',
), ),
array(
'name' => 'batch_manager_url_filter',
'type' => 'trigger_change',
'vars' => array('array', 'bulk_manager_filter', 'string', 'type', 'string', 'value'),
'files' => array('admin\batch_manager.php'),
'infos' => 'New in 2.7.',
),
); );
?> ?>
<!DOCTYPE html> <!DOCTYPE html>