Changeset 875

Timestamp:

Sep 24, 2005, 9:05:55 PM (19 years ago)

Author:

plg

Message:

• bug 162 fixed: division by zero when trying to view "all" items in admin/element_set_(global|unit)

Location:

trunk

Files:

• admin/element_set_global.php (modified) (4 diffs)
• admin/element_set_unit.php (modified) (1 diff)
• doc/ChangeLog (modified) (1 diff)

trunk/admin/element_set_global.php

@@ -94 +94 @@
     case 'selection' :
     {
-      $collection = $_POST['selection'];
+      if (!isset($_POST['selection']) or count($_POST['selection']) == 0)
+      {
+        array_push($page['errors'], l10n('Select at least one picture'));
+      }
+      else
+      {
+        $collection = $_POST['selection'];
+      }
       break;
     }
   }
 
-  if ($_POST['associate'] != 0)
+  if ($_POST['associate'] != 0 and count($collection) > 0)
   {
     $datas = array();
@@ -126 +133 @@
   }
 
-  if ($_POST['dissociate'] != 0)
+  if ($_POST['dissociate'] != 0 and count($collection) > 0)
   {
     // physical links must not be broken, so we must first retrieve image_id
@@ -167 +174 @@
   
   // updating elements is useful only if needed...
-  if (count($dbfields['update']) > 0)
+  if (count($dbfields['update']) > 0 and count($collection) > 0)
   {
     $query = '
@@ -393 +400 @@
 
 $page['cols'] = !empty($_GET['cols']) ? intval($_GET['cols']) : 5;
-$page['nb_images'] = !empty($_GET['display']) ? intval($_GET['display']) : 20;
+
+// how many items to display on this page
+if (!empty($_GET['display']))
+{
+  if ('all' == $_GET['display'])
+  {
+    $page['nb_images'] = count($page['cat_elements_id']);
+  }
+  else
+  {
+    $page['nb_images'] = intval($_GET['display']);
+  }
+}
+else
+{
+  $page['nb_images'] = 20;
+}
 
 if (count($page['cat_elements_id']) > 0)

trunk/admin/element_set_unit.php

@@ -158 +158 @@
 // +-----------------------------------------------------------------------+
 
-$page['nb_images'] = !empty($_GET['display']) ? intval($_GET['display']) : 5;
+// how many items to display on this page
+if (!empty($_GET['display']))
+{
+  if ('all' == $_GET['display'])
+  {
+    $page['nb_images'] = count($page['cat_elements_id']);
+  }
+  else
+  {
+    $page['nb_images'] = intval($_GET['display']);
+  }
+}
+else
+{
+  $page['nb_images'] = 5;
+}
+
 
 

trunk/doc/ChangeLog

@@ +1 @@
+2005-09-21 Pierrick LE GALL
+
+        * bug 162 fixed: division by zero when trying to view "all" items
+        in admin/element_set_(global|unit)
+        
 2005-09-21 Pierrick LE GALL