[Fmsystem-commits] [8833] rental: fetch all

[Sigurd Nes]

Revision: 8833
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8833
Author:   sigurdne
Date:     2012-02-13 07:49:24 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
rental: fetch all

Modified Paths:
--------------
    trunk/rental/inc/class.socontract.inc.php

Modified: trunk/rental/inc/class.socontract.inc.php
===================================================================
--- trunk/rental/inc/class.socontract.inc.php   2012-02-13 07:33:12 UTC (rev 
8832)
+++ trunk/rental/inc/class.socontract.inc.php   2012-02-13 07:49:24 UTC (rev 
8833)
@@ -413,14 +413,29 @@
                $order_field = $this->order_field ? ", {$this->order_field}" : 
'';
                $sql_end =   str_replace('SELECT DISTINCT contract.id',"SELECT 
DISTINCT contract.id {$order_field}", $sql_minimized) . " GROUP BY contract.id 
{$order_field} {$this->ordermethod}";
        //_debug_array($sql_end);
-               $this->db->limit_query($sql_end,$start_index,__LINE__,__FILE__, 
$num_of_objects);
 
                $records = array();
-               while ($this->db->next_record())
+               if( isset($filters['contract_id']) && $filters['contract_id'])
                {
-                       $records[] =  (int)$this->db->f('id');
+                       $records[] =  (int)$filters['contract_id'];
                }
+               else
+               {
+                       if($num_of_objects == null)
+                       {
+                               $this->db->query($sql_end,__LINE__,__FILE__, 
false, true);
+                       }
+                       else
+                       {
+                               
$this->db->limit_query($sql_end,$start_index,__LINE__,__FILE__, 
$num_of_objects);
+                       }
 
+                       while ($this->db->next_record())
+                       {
+                               $records[] =  (int)$this->db->f('id');
+                       }
+               }
+
                foreach ($records as $id)
                {
                        $this->db->query("{$sql_parts[0]} contract.id = 
{$id}",__LINE__,__FILE__);