Changeset 635 for trunk/admin/cat_list.php

Timestamp:

Dec 5, 2004, 10:28:40 PM (19 years ago)

Author:

plg

Message:

• on picture.php, related categories under the element are displayed in global_rank order

• when adding a new virtual category, initializes its global_rank

• bug fixed : in admin/cat_list, false next rank

• in admin/cat_modify, complete directory is calculated only if category is not virtual

• admin/picture_modify rewritten : graphically nearer to admin/cat_modify, virtual associations are back

• update_category partially rewritten : take an array of categories in parameter, becomes optionnaly recursive, use the set_random_representant function, set a random representant for categories with elements and no representant

• bug fixed : on a search results screen, elements belonging to more than 1 category were shown more than once

• bug fixed : in admin/cat_modify, changing a value in a textefield and hitting enter was setting a new random representant

File:

• trunk/admin/cat_list.php (modified) (3 diffs)

trunk/admin/cat_list.php

@@ -63 +63 @@
     // As we don't create a virtual category every day, let's do (far) too
     // much queries
-    if ($parent_id != 'NULL')
-    {
-      $query = '
-SELECT uppercats
-  FROM '.CATEGORIES_TABLE.'
-  WHERE id = '.$parent_id.'
-;';
-      $parent_uppercats = array_pop(mysql_fetch_array(pwg_query($query)));
-    }
-        
+    
     // we have then to add the virtual category
     $query = '
@@ -88 +79 @@
 ;';
     $my_id = array_pop(mysql_fetch_array(pwg_query($query)));
-
-    $query = '
-UPDATE '.CATEGORIES_TABLE.'
-  SET uppercats = \'';
+    
+    if ($parent_id != 'NULL')
+    {
+      $query = '
+SELECT uppercats, global_rank
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id = '.$parent_id.'
+;';
+      $result = pwg_query($query);
+      $row = mysql_fetch_array($result);
+      
+      $parent_uppercats = $row['uppercats'];
+      $parent_global_rank = $row['global_rank'];
+    }
+
+    $query = '
+UPDATE '.CATEGORIES_TABLE.'
+';
     if (!empty($parent_uppercats))
     {
-      $query.= $parent_uppercats.',';
-    }
-    $query.= $my_id;
-    $query.= '\'
+      $query.= "  SET uppercats = CONCAT('".$parent_uppercats."',',',id)";
+    }
+    else
+    {
+      $query.= '  SET uppercats = id';
+    }
+    if (!empty($parent_global_rank))
+    {
+      $query.= "  , global_rank = CONCAT('".$parent_global_rank."','.',rank)";
+    }
+    else
+    {
+      $query.= '  , uppercats = id';
+    }
+    $query.= '
   WHERE id = '.$my_id.'
 ;';
@@ -277 +293 @@
 $template->set_filenames(array('categories'=>'admin/cat_list.tpl'));
 
+$form_action = PHPWG_ROOT_PATH.'admin.php?page=cat_list';
+if (isset($_GET['parent_id']))
+{
+  $form_action.= '&parent_id='.$_GET['parent_id'];
+}
+
 $template->assign_vars(array(
   'CATEGORIES_NAV'=>$navigation,
-  'NEXT_RANK'=>count($categories)+1,
+  'NEXT_RANK'=>max(array_keys($categories))+1,
+  'F_ACTION'=>$form_action,
   
   'L_ADD_VIRTUAL'=>$lang['cat_add'],