Changeset 18460


Ignore:
Timestamp:
Oct 4, 2012, 4:15:41 PM (12 years ago)
Author:
mistic100
Message:

Merged revision(s) r18459 from trunk:
bug:2756 feature:2737 on batch manager use "tag" url parameter instead of re-use "cat"

Location:
branches/2.4/admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/admin/batch_manager.php

    r18333 r18460  
    9292  }
    9393}
    94 
    95 if (isset($_GET['cat']))
     94else if (isset($_GET['cat']))
    9695{
    9796  if ('caddie' == $_GET['cat'])
     
    101100      );
    102101  }
    103 
    104   if ('recent' == $_GET['cat'])
     102  else if ('recent' == $_GET['cat'])
    105103  {
    106104    $_SESSION['bulk_manager_filter'] = array(
     
    108106      );
    109107  }
    110 
    111   if (is_numeric($_GET['cat']))
     108  else if (is_numeric($_GET['cat']))
    112109  {
    113110    $_SESSION['bulk_manager_filter'] = array(
     
    115112      );
    116113  }
    117  
    118   if (strpos($_GET['cat'],'tag-')===0)
    119   {
    120     $_SESSION['bulk_manager_filter']=array();
    121     $_SESSION['bulk_manager_filter']['tags'] = array(intval(substr($_GET['cat'],4)));
    122     $_SESSION['bulk_manager_filter']['tag_mode'] = 'AND';
     114}
     115else if (isset($_GET['tag']))
     116{
     117  if (is_numeric($_GET['tag']))
     118  {
     119    $_SESSION['bulk_manager_filter'] = array(
     120      'tags' => array($_GET['tag']),
     121      'tag_mode' => 'AND',
     122      );
    123123  }
    124124}
  • branches/2.4/admin/batch_manager_global.php

    r17290 r18460  
    475475    'START' => $page['start'],
    476476    'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')),
    477     'F_ACTION'=>$base_url.get_query_string_diff(array('cat','start')),
     477    'F_ACTION'=>$base_url.get_query_string_diff(array('cat','start','tag')),
    478478   )
    479479 );
  • branches/2.4/admin/tags.php

    r17766 r18460  
    353353  $tag['counter'] = intval(@$tag_counters[ $tag['id'] ]);
    354354  $tag['U_VIEW'] = make_index_url(array('tags'=>array($tag)));
    355   $tag['U_EDIT'] = 'admin.php?page=batch_manager&cat=tag-'.$tag['id'];
     355  $tag['U_EDIT'] = 'admin.php?page=batch_manager&tag='.$tag['id'];
    356356
    357357  $alt_names = trigger_event('get_tag_alt_names', array(), $raw_name);
Note: See TracChangeset for help on using the changeset viewer.