fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [15088] Syncromind: Merge 14936:15027 from trunk


From: sigurdne
Subject: [Fmsystem-commits] [15088] Syncromind: Merge 14936:15027 from trunk
Date: Fri, 13 May 2016 12:07:05 +0000 (UTC)

Revision: 15088
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15088
Author:   sigurdne
Date:     2016-05-13 12:07:05 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uiinvestment.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.uiinvestment.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiinvestment.inc.php   
2016-05-13 12:07:02 UTC (rev 15087)
+++ branches/dev-syncromind-2/property/inc/class.uiinvestment.inc.php   
2016-05-13 12:07:05 UTC (rev 15088)
@@ -147,6 +147,7 @@
                        $order = phpgw::get_var('order');
                        $draw = phpgw::get_var('draw', 'int');
                        $columns = phpgw::get_var('columns');
+                       $export = phpgw::get_var('export', 'bool');
                        $order[0]['column'] = 2;
                        $order[0]['dir'] = "desc";
 
@@ -160,7 +161,7 @@
                                'filter' => $this->filter,
                                'cat_id' => $this->cat_id,
                                'part_of_town_id' => $this->part_of_town_id,
-                               'allrows' => phpgw::get_var('length', 'int') == 
-1
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1 || $export
                        );
 
                        $investment_list = $this->bo->read($params);
@@ -216,7 +217,7 @@
                                $counter++;
                        }
 
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $content;
                        }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]