diff options
author | mistic100 <mistic@piwigo.org> | 2012-10-04 14:14:25 +0000 |
---|---|---|
committer | mistic100 <mistic@piwigo.org> | 2012-10-04 14:14:25 +0000 |
commit | b5f020ee66b13bce8275a4d64faf8710c362a6d1 (patch) | |
tree | 3928f6a7bf9aec89d28dc8c6d1bc47e3ed259d77 /admin | |
parent | 2a9e479384a572f248b29924f1af546c5e40a344 (diff) |
bug:2756 feature:2737 on batch manager use "tag" url parameter instead of re-use "cat"
git-svn-id: http://piwigo.org/svn/trunk@18459 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r-- | admin/batch_manager.php | 22 | ||||
-rw-r--r-- | admin/batch_manager_global.php | 2 | ||||
-rw-r--r-- | admin/tags.php | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/admin/batch_manager.php b/admin/batch_manager.php index 48470b330..e144731d8 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -104,8 +104,7 @@ if (isset($_POST['submitFilter'])) } } } - -if (isset($_GET['cat'])) +else if (isset($_GET['cat'])) { if ('caddie' == $_GET['cat']) { @@ -113,26 +112,27 @@ if (isset($_GET['cat'])) 'prefilter' => 'caddie' ); } - - if ('recent' == $_GET['cat']) + else if ('recent' == $_GET['cat']) { $_SESSION['bulk_manager_filter'] = array( 'prefilter' => 'last import' ); } - - if (is_numeric($_GET['cat'])) + else if (is_numeric($_GET['cat'])) { $_SESSION['bulk_manager_filter'] = array( 'category' => $_GET['cat'] ); } - - if (strpos($_GET['cat'],'tag-')===0) +} +else if (isset($_GET['tag'])) +{ + if (is_numeric($_GET['tag'])) { - $_SESSION['bulk_manager_filter']=array(); - $_SESSION['bulk_manager_filter']['tags'] = array(intval(substr($_GET['cat'],4))); - $_SESSION['bulk_manager_filter']['tag_mode'] = 'AND'; + $_SESSION['bulk_manager_filter'] = array( + 'tags' => array($_GET['tag']), + 'tag_mode' => 'AND', + ); } } diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php index 8b6ec5b68..64d288824 100644 --- a/admin/batch_manager_global.php +++ b/admin/batch_manager_global.php @@ -474,7 +474,7 @@ $template->assign( 'all_elements' => $page['cat_elements_id'], 'START' => $page['start'], 'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')), - 'F_ACTION'=>$base_url.get_query_string_diff(array('cat','start')), + 'F_ACTION'=>$base_url.get_query_string_diff(array('cat','start','tag')), ) ); diff --git a/admin/tags.php b/admin/tags.php index cfb855aa7..2fdfb4b04 100644 --- a/admin/tags.php +++ b/admin/tags.php @@ -461,7 +461,7 @@ while ($tag = pwg_db_fetch_assoc($result)) $tag['name'] = trigger_event('render_tag_name', $raw_name); $tag['counter'] = intval(@$tag_counters[ $tag['id'] ]); $tag['U_VIEW'] = make_index_url(array('tags'=>array($tag))); - $tag['U_EDIT'] = 'admin.php?page=batch_manager&cat=tag-'.$tag['id']; + $tag['U_EDIT'] = 'admin.php?page=batch_manager&tag='.$tag['id']; $alt_names = trigger_event('get_tag_alt_names', array(), $raw_name); $alt_names = array_diff( array_unique($alt_names), array($tag['name']) ); |