[Fmsystem-commits] [6556] Fixed bug on display of property locations.

[Erik Holm-Larsen]

Revision: 6556
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6556
Author:   erikhl
Date:     2010-11-09 10:57:15 +0000 (Tue, 09 Nov 2010)
Log Message:
-----------
Fixed bug on display of property locations.
Datatable now displays rows according to chosen number og elements

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

Modified: trunk/rental/inc/class.uiproperty_location.inc.php
===================================================================
--- trunk/rental/inc/class.uiproperty_location.inc.php  2010-11-09 09:20:30 UTC 
(rev 6555)
+++ trunk/rental/inc/class.uiproperty_location.inc.php  2010-11-09 10:57:15 UTC 
(rev 6556)
@@ -47,6 +47,7 @@
                                        $row = 
$property_bolocation->read_single($gabelement['location_code']);
                                        $row['gab'] = 
rental_uicommon::get_nicely_formatted_gab_id($gabelement['gab_id']);  
                                        $rows[] = $row;
+                                       $rows_total[] = $row; 
                                        //TODO: Add gabno for element 
                                }
                        }
@@ -55,14 +56,22 @@
                                {
                                        $type_id = 2;
                                }
-                               $rows = 
$property_bolocation->read(array('type_id' => $type_id, 'sallrows' => true));
+                               $user_rows_per_page = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+                               $property_bolocation->start = $start_index;
+                               $tmp_count = phpgw::get_var('results', 'int', 
'GET', 0);
+                               if(isset($tmp_count) && $tmp_count > 0){
+                                       
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] = 
$num_of_objects;
+                               }
+                               $rows_total = 
$property_bolocation->read(array('type_id' => $type_id, 'allrows' => true));
+                               $rows = 
$property_bolocation->read(array('type_id' => $type_id));
+                               
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] = 
$user_rows_per_page;
                        }
                        
                        //Add context menu columns (actions and labels)
                        array_walk($rows, array($this, 'add_actions'), 
array($composite_id, $type_id));
                        //Build a YUI result from the data
                        //
-                       $result_data = array('results' => $rows, 
'total_records' => count($rows));      
+                       $result_data = array('results' => $rows, 
'total_records' => count($rows_total));        
                        return $this->yui_results($result_data, 
'total_records', 'results');
                }