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

bug:2756 feature:2737 on batch manager use "tag" url parameter instead of re-use "cat"

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@18459 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2012-10-04 14:14:25 +00:00
parent 2a9e479384
commit b5f020ee66
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/batch_manager.php
+11 -11
View File
@@ -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',
);
}
}
admin/batch_manager_global.php
+1 -1
View File
@@ -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')),
)
);
admin/tags.php
+1 -1
View File
@@ -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']) );