aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2012-10-04 14:15:41 +0000
committermistic100 <mistic@piwigo.org>2012-10-04 14:15:41 +0000
commit4cf33a00254a77cba8d052edc431885b653e65d9 (patch)
tree427ca0fb0cb19908a603f02fbd0235ed2a29e43f /admin
parentd7df3f0a0cd6a7169ff84411e390527c50b67184 (diff)
Merged revision(s) r18459 from trunk:
bug:2756 feature:2737 on batch manager use "tag" url parameter instead of re-use "cat" git-svn-id: http://piwigo.org/svn/branches/2.4@18460 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/batch_manager.php22
-rw-r--r--admin/batch_manager_global.php2
-rw-r--r--admin/tags.php2
3 files changed, 13 insertions, 13 deletions
diff --git a/admin/batch_manager.php b/admin/batch_manager.php
index 136f4d10e..0b9b1f77c 100644
--- a/admin/batch_manager.php
+++ b/admin/batch_manager.php
@@ -91,8 +91,7 @@ if (isset($_POST['submitFilter']))
}
}
}
-
-if (isset($_GET['cat']))
+else if (isset($_GET['cat']))
{
if ('caddie' == $_GET['cat'])
{
@@ -100,26 +99,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 87fbf440c..9df94e4df 100644
--- a/admin/tags.php
+++ b/admin/tags.php
@@ -352,7 +352,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&amp;cat=tag-'.$tag['id'];
+ $tag['U_EDIT'] = 'admin.php?page=batch_manager&amp;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']) );