diff --git a/admin/batch_manager.php b/admin/batch_manager.php index 935445ccc..19dfea311 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -83,6 +83,11 @@ if (isset($_POST['submitFilter'])) if (in_array($_POST['filter_level'], $conf['available_permission_levels'])) { $_SESSION['bulk_manager_filter']['level'] = $_POST['filter_level']; + + if (isset($_POST['filter_level_include_lower'])) + { + $_SESSION['bulk_manager_filter']['level_include_lower'] = true; + } } } } @@ -289,10 +294,16 @@ if (isset($_SESSION['bulk_manager_filter']['category'])) if (isset($_SESSION['bulk_manager_filter']['level'])) { + $operator = '='; + if (isset($_SESSION['bulk_manager_filter']['level_include_lower'])) + { + $operator = '<='; + } + $query = ' SELECT id FROM '.IMAGES_TABLE.' - WHERE level >= '.$_SESSION['bulk_manager_filter']['level'].' + WHERE level '.$operator.' '.$_SESSION['bulk_manager_filter']['level'].' ;'; array_push( $filter_sets, diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php index 6242a2dc9..95cddf520 100644 --- a/admin/batch_manager_global.php +++ b/admin/batch_manager_global.php @@ -519,15 +519,25 @@ SELECT // +-----------------------------------------------------------------------+ // privacy level +foreach ($conf['available_permission_levels'] as $level) +{ + $level_options[$level] = l10n(sprintf('Level %d', $level)); + + if (0 == $level) + { + $level_options[$level] = l10n('Everybody'); + } +} $template->assign( - array( - 'filter_level_options'=> get_privacy_level_options(), - 'filter_level_options_selected' => isset($_SESSION['bulk_manager_filter']['level']) - ? $_SESSION['bulk_manager_filter']['level'] - : 0, + array( + 'filter_level_options'=> $level_options, + 'filter_level_options_selected' => isset($_SESSION['bulk_manager_filter']['level']) + ? $_SESSION['bulk_manager_filter']['level'] + : 0, ) ); +// tags if (!empty($_SESSION['bulk_manager_filter']['tags'])) { $query = ' diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index 90182d9a9..7f5d82d1b 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -538,10 +538,11 @@ jQuery(window).load(function() {