Changeset 18460

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:

• batch_manager.php (modified) (4 diffs)
• batch_manager_global.php (modified) (1 diff)
• tags.php (modified) (1 diff)

branches/2.4/admin/batch_manager.php

@@ -92 +92 @@
   }
 }
-
-if (isset($_GET['cat']))
+else if (isset($_GET['cat']))
 {
   if ('caddie' == $_GET['cat'])
@@ -101 +100 @@
       );
   }
-
-  if ('recent' == $_GET['cat'])
+  else if ('recent' == $_GET['cat'])
   {
     $_SESSION['bulk_manager_filter'] = array(
@@ -108 +106 @@
       );
   }
-
-  if (is_numeric($_GET['cat']))
+  else if (is_numeric($_GET['cat']))
   {
     $_SESSION['bulk_manager_filter'] = array(
@@ -115 +112 @@
       );
   }
-  
-  if (strpos($_GET['cat'],'tag-')===0)
-  {
-    $_SESSION['bulk_manager_filter']=array();
-    $_SESSION['bulk_manager_filter']['tags'] = array(intval(substr($_GET['cat'],4)));
-    $_SESSION['bulk_manager_filter']['tag_mode'] = 'AND';
+}
+else if (isset($_GET['tag']))
+{
+  if (is_numeric($_GET['tag']))
+  {
+    $_SESSION['bulk_manager_filter'] = array(
+      'tags' => array($_GET['tag']),
+      'tag_mode' => 'AND',
+      );
   }
 }

branches/2.4/admin/batch_manager_global.php

@@ -475 +475 @@
     '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')),
    )
  );

branches/2.4/admin/tags.php

@@ -353 +353 @@
   $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);