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

[sigurdne]

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

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

Modified: branches/dev-syncromind-2/property/inc/class.uipricebook.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uipricebook.inc.php    
2016-05-13 12:07:13 UTC (rev 15091)
+++ branches/dev-syncromind-2/property/inc/class.uipricebook.inc.php    
2016-05-13 12:07:16 UTC (rev 15092)
@@ -157,6 +157,7 @@
                        $order = phpgw::get_var('order');
                        $draw = phpgw::get_var('draw', 'int');
                        $columns = phpgw::get_var('columns');
+                       $export = phpgw::get_var('export', 'bool');
 
                        $params = array
                                (
@@ -167,7 +168,7 @@
                                'sort' => $order[0]['dir'],
                                'filter' => $this->filter,
                                'cat_id' => $this->cat_id,
-                               'allrows' => phpgw::get_var('length', 'int') == 
-1
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1 || $export,
                        );
 
                        $pricebook_list = $this->bo->read($params);
@@ -206,7 +207,7 @@
                                }
                        }
 
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $content;
                        }
@@ -462,6 +463,7 @@
                        $draw = phpgw::get_var('draw', 'int');
                        $columns = phpgw::get_var('columns');
                        $cat_id = phpgw::get_var('cat_id');
+                       $export = phpgw::get_var('export', 'bool');
 
                        switch ($columns[$order[0]['column']]['data'])
                        {
@@ -481,12 +483,12 @@
                                'sort' => $order[0]['dir'],
                                'filter' => $this->filter,
                                'cat_id' => $cat_id,
-                               'allrows' => phpgw::get_var('length', 'int') == 
-1
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1 || $export,
                        );
 
                        $values = $this->bo->read_agreement_group($params);
 
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $values;
                        }
@@ -1159,6 +1161,7 @@
                        $order = phpgw::get_var('order');
                        $draw = phpgw::get_var('draw', 'int');
                        $columns = phpgw::get_var('columns');
+                       $export = phpgw::get_var('export', 'bool');
 
                        $params = array
                                (
@@ -1169,12 +1172,12 @@
                                'sort' => $order[0]['dir'],
                                'filter' => $this->filter,
                                'cat_id' => $this->cat_id,
-                               'allrows' => phpgw::get_var('length', 'int') == 
-1
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1 || $export
                        );
 
                        $values = 
$this->bo->read_activities_pr_agreement_group($params);
 
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $values;
                        }
@@ -1356,6 +1359,7 @@
                        $order = phpgw::get_var('order');
                        $draw = phpgw::get_var('draw', 'int');
                        $columns = phpgw::get_var('columns');
+                       $export = phpgw::get_var('export', 'bool');
 
                        $params = array
                                (
@@ -1366,7 +1370,7 @@
                                'sort' => $order[0]['dir'],
                                'filter' => $this->filter,
                                'cat_id' => $this->cat_id,
-                               'allrows' => phpgw::get_var('length', 'int') == 
-1,
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1 || $export,
                                'activity_id' => $activity_id
                        );
 
@@ -1384,7 +1388,7 @@
                                );
                        }
 
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $content;
                        }