archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r12629 from branch 2.3 to trunk

Browse source 
bug 2506 fixed: Batch Manager does not take permissions into account when
filtering on tags

feature 2507 added: Batch Manager can filter on "all tags" or "any tag"



git-svn-id: http://piwigo.org/svn/trunk@12630 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-11-15 11:58:10 +00:00
commit f6a6701fb7
3 changed files with 49 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

23
admin/batch_manager.php
View file

@ -71,6 +71,11 @@ if (isset($_POST['submitFilter']))
if (isset($_POST['filter_tags_use']))
{
$_SESSION['bulk_manager_filter']['tags'] = get_tag_ids($_POST['filter_tags'], false);
if (isset($_POST['tag_mode']) and in_array($_POST['tag_mode'], array('AND', 'OR')))
{
$_SESSION['bulk_manager_filter']['tag_mode'] = $_POST['tag_mode'];
}
}
if (isset($_POST['filter_level_use']))
@ -297,16 +302,16 @@ SELECT id
if (!empty($_SESSION['bulk_manager_filter']['tags']))
{
$query = '
SELECT image_id
FROM '.IMAGE_TAG_TABLE.
'WHERE tag_id IN('.implode(',',$_SESSION['bulk_manager_filter']['tags']).')
GROUP BY image_id
HAVING COUNT(tag_id)='.count($_SESSION['bulk_manager_filter']['tags']);
array_push(
array_push(
$filter_sets,
get_image_ids_for_tags($_SESSION['bulk_manager_filter']['tags'])
);
get_image_ids_for_tags(
$_SESSION['bulk_manager_filter']['tags'],
$_SESSION['bulk_manager_filter']['tag_mode'],
null,
null,
false // we don't apply permissions in administration screens
)
);
}
$current_set = array_shift($filter_sets);