|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [6638] property: pagination |
| Date: | Fri, 03 Dec 2010 11:59:45 +0000 |
Revision: 6638
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6638
Author: sigurdne
Date: 2010-12-03 11:59:44 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
property: pagination
Modified Paths:
--------------
trunk/property/inc/class.boentity.inc.php
trunk/property/inc/class.soentity.inc.php
trunk/property/inc/class.uientity.inc.php
trunk/property/js/yahoo/property.js
Modified: trunk/property/inc/class.boentity.inc.php
===================================================================
--- trunk/property/inc/class.boentity.inc.php 2010-12-03 09:52:39 UTC (rev
6637)
+++ trunk/property/inc/class.boentity.inc.php 2010-12-03 11:59:44 UTC (rev
6638)
@@ -123,8 +123,10 @@
$this->use_session = true;
}
- $this->start = $start ? $start : 0;
-
+ if(isset($_POST['start']) || isset($_GET['start']))
+ {
+ $this->start = $start;
+ }
if(isset($_POST['query']) || isset($_GET['query']))
{
$this->query = $query;
Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php 2010-12-03 09:52:39 UTC (rev
6637)
+++ trunk/property/inc/class.soentity.inc.php 2010-12-03 11:59:44 UTC (rev
6638)
@@ -294,10 +294,6 @@
$this->uicols = $uicols;
//_debug_array($cols_return_extra);
- if($dry_run)
- {
- return array();
- }
if ($order)
{
@@ -487,6 +483,11 @@
$this->db->next_record();
$this->total_records = $this->db->f('cnt');
+ if($dry_run)
+ {
+ return array();
+ }
+
if(!$allrows)
{
$this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php 2010-12-03 09:52:39 UTC (rev
6637)
+++ trunk/property/inc/class.uientity.inc.php 2010-12-03 11:59:44 UTC (rev
6638)
@@ -376,23 +376,23 @@
'entity_id'
=> $this->entity_id,
'cat_id' =>
$this->cat_id,
'type'
=> $this->type,
-
'district_id' =>
$this->district_id,
-
'status'
=> $this->status,
-
'filter'
=> $this->filter,
+
// 'district_id' =>
$this->district_id,
+
// 'status'
=> $this->status,
+
// 'filter'
=> $this->filter,
//
'location_code'
=> $this->location_code,
-
'criteria_id'
=> $this->criteria_id
+
// 'criteria_id'
=> $this->criteria_id
));
$datatable['config']['allow_allrows'] = true;
$datatable['config']['base_java_url'] =
"menuaction:'property.uientity.index',".
"entity_id:'{$this->entity_id}',".
"cat_id:'{$this->cat_id}',".
-
"type:'{$this->type}',".
-
"district_id:'{$this->district_id}',".
-
"status:'{$this->status}',".
-
"filter:'{$this->filter}',".
-
"criteria_id:'{$this->criteria_id}',".
-
"location_code:'{$this->location_code}'";
+
"type:'{$this->type}'";
+
// "district_id:'{$this->district_id}',".
+
// "status:'{$this->status}',".
+
// "filter:'{$this->filter}',".
+
// "criteria_id:'{$this->criteria_id}',".
+
//
"location_code:'{$this->location_code}'";
// this array "$arr_filter_hide" indicate what
filters are hidden or not
$arr_filter_hide = array();
Modified: trunk/property/js/yahoo/property.js
===================================================================
--- trunk/property/js/yahoo/property.js 2010-12-03 09:52:39 UTC (rev 6637)
+++ trunk/property/js/yahoo/property.js 2010-12-03 11:59:44 UTC (rev 6638)
@@ -839,9 +839,13 @@
}
flag++;
+// startIndex = values_ds.startIndex;
+// myinitialPage = mytotalRows/startIndex
+
myPaginatorConfig = {
containers
: ['paging'],
totalRecords
: mytotalRows,
+// initialPage
: 2,//initialPage,
pageLinks
: 10,
rowsPerPage
: values_ds.recordsReturned, //MAXIMO el PHPGW me devuelve 15
valor configurado por preferencias
rowsPerPageOptions : [myrowsPerPage, mytotalRows],
| [Prev in Thread] | Current Thread | [Next in Thread] |