adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 2596: Batch Manager, improve ergonomy on privacy level filter

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@13646 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2012-03-19 11:07:08 +00:00
parent db836252ce
commit adf689b9c9
5 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/batch_manager.php
+12 -1
View File
@@ -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,
admin/batch_manager_global.php
+15 -5
View File
@@ -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 = '
admin/themes/default/template/batch_manager_global.tpl
+3 -2
View File
@@ -538,10 +538,11 @@ jQuery(window).load(function() {
<li id="filter_level" {if !isset($filter.level)}style="display:none"{/if}>
<a href="#" class="removeFilter" title="remove this filter"><span>[x]</span></a>
<input type="checkbox" name="filter_level_use" class="useFilterCheckbox" {if isset($filter.level)}checked="checked"{/if}>
{'Who can see these photos?'|@translate}
{'Privacy level'|@translate}
<select name="filter_level" size="1">
{html_options options=$filter_level_options selected=$filter_level_options_selected}
</select>
<label><input type="checkbox" name="filter_level_include_lower" {if isset($filter.level_include_lower)}checked="checked"{/if}> {'include photos with lower privacy level'|@translate}</label>
</li>
</ul>
@@ -552,7 +553,7 @@ jQuery(window).load(function() {
<option value="filter_prefilter">{'Predefined filter'|@translate}</option>
<option value="filter_category">{'Album'|@translate}</option>
<option value="filter_tags">{'Tags'|@translate}</option>
<option value="filter_level">{'Who can see these photos?'|@translate}</option>
<option value="filter_level">{'Privacy level'|@translate}</option>
</select>
<!-- <input id="removeFilters" class="submit" type="submit" value="Remove all filters" name="removeFilters"> -->
<a id="removeFilters" href="">{'Remove all filters'|@translate}</a>
language/en_UK/admin.lang.php
+1
View File
@@ -873,4 +873,5 @@ $lang['There is no group in this gallery.'] = 'There is no group in this gallery
$lang['Permission granted for users'] = 'Permission granted for users';
$lang['Select users...'] = 'Select users...';
$lang['%u users have automatic permission because they belong to a granted group.'] = '%u users have automatic permission because they belong to a granted group.';
$lang['include photos with lower privacy level'] = 'include photos with lower privacy level';
?>
language/fr_FR/admin.lang.php
+1
View File
@@ -888,4 +888,5 @@ $lang['There is no group in this gallery.'] = 'Il n\'y a pas de groupe dans cett
$lang['Permission granted for users'] = 'Permission accordée pour les utilisateurs';
$lang['Select users...'] = 'Sélectionnez les utilisateurs...';
$lang['%u users have automatic permission because they belong to a granted group.'] = '%u utilisateurs ont automatiquement la permission car ils appartiennent à un groupe autorisé.';
$lang['include photos with lower privacy level'] = 'inclure les photos d\'un niveau de confidentialité inférieur';
?>