Changeset 1065 for trunk/admin/picture_modify.php

Timestamp:

Mar 5, 2006, 11:44:32 PM (18 years ago)

Author:

plg

Message:

bug fixed: table #categories_link was created with an hardcoded prefix

bug fixed: on source/destination links, if an image/category association is
added to a source, destinations must be filled. If an image/category
association is delete from a source, the same association must be deleted in
the destinations.

File:

• trunk/admin/picture_modify.php (modified) (2 diffs)

trunk/admin/picture_modify.php

@@ -122 +122 @@
 {
   $datas = array();
+  
   foreach ($_POST['cat_dissociated'] as $category_id)
   {
-    array_push($datas, array('image_id' => $_GET['image_id'],
-                             'category_id' => $category_id));
-  }
-  mass_inserts(IMAGE_CATEGORY_TABLE, array('image_id', 'category_id'), $datas);
-
+    array_push(
+      $datas,
+      array(
+        'image_id' => $_GET['image_id'],
+        'category_id' => $category_id
+        )
+      );
+  }
+  
+  mass_inserts(
+    IMAGE_CATEGORY_TABLE,
+    array('image_id', 'category_id'),
+    $datas
+    );
+
+  check_links();
   update_category($_POST['cat_dissociated']);
 }
@@ -136 +148 @@
     and count($_POST['cat_associated']) > 0)
 {
+  $associated_categories = $_POST['cat_associated'];
+
+  // If the same element is associated to a source and its destinations,
+  // dissociating the element with the source implies dissociating the
+  // element fwith the destination.
+  $destinations_of = get_destinations($_POST['cat_associated']);
+  foreach ($destinations_of as $source => $destinations)
+  {
+    $associated_categories = array_merge(
+      $associated_categories,
+      $destinations
+      );
+  }
+  
   $query = '
 DELETE FROM '.IMAGE_CATEGORY_TABLE.'
   WHERE image_id = '.$_GET['image_id'].'
-    AND category_id IN ('.implode(',',$_POST['cat_associated'] ).')
+    AND category_id IN ('.implode(',', $associated_categories).')
+    AND is_storage = \'false\'
 ';
   pwg_query($query);
+
+  check_links();
   update_category($_POST['cat_associated']);
 }