[Fmsystem-commits] [12225] fix rows per page and download

[Sigurd Nes]

Revision: 12225
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12225
Author:   sigurdne
Date:     2014-10-23 14:19:42 +0000 (Thu, 23 Oct 2014)
Log Message:
-----------
fix rows per page and download

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.socondition_survey.inc.php
    branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php

Modified: branches/dev-syncromind/property/inc/class.socondition_survey.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.socondition_survey.inc.php       
2014-10-23 08:21:09 UTC (rev 12224)
+++ branches/dev-syncromind/property/inc/class.socondition_survey.inc.php       
2014-10-23 14:19:42 UTC (rev 12225)
@@ -52,6 +52,7 @@
                        $dir            = isset($data['dir']) ? $data['dir'] :  
'DESC';
                        $cat_id         = isset($data['cat_id']) ? 
(int)$data['cat_id'] : 0;
                        $allrows        = isset($data['allrows']) ? 
$data['allrows'] : '';
+                       $results        = isset($data['results'])  ? (int) 
$data['results'] : 0;
 
                        $table = 'fm_condition_survey';
                        if ($sort)
@@ -101,7 +102,7 @@
 
                        if(!$allrows)
                        {
-                               $this->_db->limit_query($sql . 
$ordermethod,$start,__LINE__,__FILE__);
+                               $this->_db->limit_query($sql . 
$ordermethod,$start,__LINE__,__FILE__,$results);
                        }
                        else
                        {

Modified: branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php       
2014-10-23 08:21:09 UTC (rev 12224)
+++ branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php       
2014-10-23 14:19:42 UTC (rev 12225)
@@ -138,39 +138,19 @@
                                                                'text' => 
lang('category') . ':',
                                                                'list' => 
$categories,
                                                        ),
-                                                       array('type' => 'text',
-                                                               'text' => 
lang('search'),
-                                                               'name' => 
'query'
-                                                       ),
                                                        array(
-                                                               'type' => 
'submit',
-                                                               'name' => 
'search',
-                                                               'value' => 
lang('Search')
-                                                       ),
-                                                       array(
                                                                'type' => 
'link',
                                                                'value' => 
lang('new'),
                                                                'href' => 
self::link(array('menuaction' => 'property.uicondition_survey.add')),
                                                                'class' => 
'new_item'
-                                                       ),
-                                                       array(
-                                                               'type' => 
'link',
-                                                               'value' => 
lang('download'),
-                                                               'href' => 
'javascript:window.open("'. self::link(array('menuaction' => 
'property.uicondition_survey.download', 'export' => true, 'allrows' => true)) . 
'","window")',
-                                                               'class' => 
'new_item'
-                                                       ),
-                                                       array(
-                                                               'type' => 
'link',
-                                                               'value' => 
$_SESSION['allrows'] ? lang('Show only active') : lang('Show all'),
-                                                               'href' => 
self::link(array('menuaction' => 'property.uicondition_survey.index', 'allrows' 
=> true))
-                                                       ),
-
+                                                       )
                                                ),
                                        ),
                                ),
                                'datatable' => array(
                                        'source' => 
self::link(array('menuaction' => 'property.uicondition_survey.index', 
'phpgw_return_as' => 'json')),
-                                       //'editor_action' => 
'property.uicondition_survey.edit_survey_title',
+                                       'download'      => 
self::link(array('menuaction' => 'property.uicondition_survey.download', 
'export' => true, 'allrows' => true)),
+                                       'allrows'       => true,
                                        'editor_action' => 
self::link(array('menuaction' => 
'property.uicondition_survey.edit_survey_title')),
                                        'field' => array(
                                                array(
@@ -324,7 +304,7 @@
                                'sort' => phpgw::get_var('sort'),
                                'dir' => phpgw::get_var('dir'),
                                'cat_id' => phpgw::get_var('cat_id', 'int', 
'REQUEST', 0),
-                               'allrows' => phpgw::get_var('allrows', 'bool')
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1
                        );
 
                        $result_objects = array();