Changeset 13646 for trunk/admin
- Timestamp:
- Mar 19, 2012, 12:07:08 PM (12 years ago)
- Location:
- trunk/admin
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/batch_manager.php
r12922 r13646 84 84 { 85 85 $_SESSION['bulk_manager_filter']['level'] = $_POST['filter_level']; 86 87 if (isset($_POST['filter_level_include_lower'])) 88 { 89 $_SESSION['bulk_manager_filter']['level_include_lower'] = true; 90 } 86 91 } 87 92 } … … 290 295 if (isset($_SESSION['bulk_manager_filter']['level'])) 291 296 { 297 $operator = '='; 298 if (isset($_SESSION['bulk_manager_filter']['level_include_lower'])) 299 { 300 $operator = '<='; 301 } 302 292 303 $query = ' 293 304 SELECT id 294 305 FROM '.IMAGES_TABLE.' 295 WHERE level >='.$_SESSION['bulk_manager_filter']['level'].'306 WHERE level '.$operator.' '.$_SESSION['bulk_manager_filter']['level'].' 296 307 ;'; 297 308 array_push( -
trunk/admin/batch_manager_global.php
r13544 r13646 520 520 521 521 // privacy level 522 foreach ($conf['available_permission_levels'] as $level) 523 { 524 $level_options[$level] = l10n(sprintf('Level %d', $level)); 525 526 if (0 == $level) 527 { 528 $level_options[$level] = l10n('Everybody'); 529 } 530 } 522 531 $template->assign( 523 524 'filter_level_options'=> get_privacy_level_options(),525 526 527 532 array( 533 'filter_level_options'=> $level_options, 534 'filter_level_options_selected' => isset($_SESSION['bulk_manager_filter']['level']) 535 ? $_SESSION['bulk_manager_filter']['level'] 536 : 0, 528 537 ) 529 538 ); 530 539 540 // tags 531 541 if (!empty($_SESSION['bulk_manager_filter']['tags'])) 532 542 { -
trunk/admin/themes/default/template/batch_manager_global.tpl
r13575 r13646 539 539 <a href="#" class="removeFilter" title="remove this filter"><span>[x]</span></a> 540 540 <input type="checkbox" name="filter_level_use" class="useFilterCheckbox" {if isset($filter.level)}checked="checked"{/if}> 541 {' Who can see these photos?'|@translate}541 {'Privacy level'|@translate} 542 542 <select name="filter_level" size="1"> 543 543 {html_options options=$filter_level_options selected=$filter_level_options_selected} 544 544 </select> 545 <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> 545 546 </li> 546 547 </ul> … … 553 554 <option value="filter_category">{'Album'|@translate}</option> 554 555 <option value="filter_tags">{'Tags'|@translate}</option> 555 <option value="filter_level">{' Who can see these photos?'|@translate}</option>556 <option value="filter_level">{'Privacy level'|@translate}</option> 556 557 </select> 557 558 <!-- <input id="removeFilters" class="submit" type="submit" value="Remove all filters" name="removeFilters"> -->
Note: See TracChangeset
for help on using the changeset viewer.