[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15444] property: pagination
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15444] property: pagination |
|
Date: |
Wed, 10 Aug 2016 11:07:49 +0000 (UTC) |
Revision: 15444
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15444
Author: sigurdne
Date: 2016-08-10 11:07:49 +0000 (Wed, 10 Aug 2016)
Log Message:
-----------
property: pagination
Modified Paths:
--------------
trunk/property/inc/class.soadmin_location.inc.php
trunk/property/inc/class.soagreement.inc.php
trunk/property/inc/class.socustom.inc.php
trunk/property/inc/class.sodocument.inc.php
trunk/property/inc/class.soevent.inc.php
trunk/property/inc/class.sogab.inc.php
trunk/property/inc/class.soinvestment.inc.php
trunk/property/inc/class.solookup.inc.php
trunk/property/inc/class.sopending_action.inc.php
trunk/property/inc/class.sopricebook.inc.php
trunk/property/inc/class.sorequest.inc.php
trunk/property/inc/class.soresponsible.inc.php
trunk/property/inc/class.sos_agreement.inc.php
trunk/property/inc/class.sotemplate.inc.php
Modified: trunk/property/inc/class.soadmin_location.inc.php
===================================================================
--- trunk/property/inc/class.soadmin_location.inc.php 2016-08-10 11:07:08 UTC
(rev 15443)
+++ trunk/property/inc/class.soadmin_location.inc.php 2016-08-10 11:07:49 UTC
(rev 15444)
@@ -92,7 +92,6 @@
{
$this->db->query($sql . $ordermethod, __LINE__,
__FILE__);
}
- #$this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
$standard = array();
while ($this->db->next_record())
Modified: trunk/property/inc/class.soagreement.inc.php
===================================================================
--- trunk/property/inc/class.soagreement.inc.php 2016-08-10 11:07:08 UTC
(rev 15443)
+++ trunk/property/inc/class.soagreement.inc.php 2016-08-10 11:07:49 UTC
(rev 15444)
@@ -390,6 +390,7 @@
$cat_id = isset($data['cat_id']) ? $data['cat_id'] : '';
$allrows = isset($data['allrows']) ? $data['allrows'] :
'';
$agreement_id = isset($data['agreement_id']) ?
$data['agreement_id'] : '';
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
$allrows = true; // return all..
@@ -495,7 +496,7 @@
$this->total_records = $this->db2->num_rows();
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
@@ -533,6 +534,7 @@
{
$agreement_id = (isset($data['agreement_id']) ?
$data['agreement_id'] : 0);
$activity_id = (isset($data['activity_id']) ?
$data['activity_id'] : 0);
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
$entity_table = 'fm_activity_price_index';
@@ -612,7 +614,7 @@
$this->total_records = $this->db2->num_rows();
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.socustom.inc.php
===================================================================
--- trunk/property/inc/class.socustom.inc.php 2016-08-10 11:07:08 UTC (rev
15443)
+++ trunk/property/inc/class.socustom.inc.php 2016-08-10 11:07:49 UTC (rev
15444)
@@ -292,6 +292,7 @@
$order = isset($data['order']) ? $data['order'] : '';
$allrows = isset($data['allrows']) ? $data['allrows'] :
'';
$custom_id = isset($data['custom_id']) &&
$data['custom_id'] ? (int)$data['custom_id'] : 0;
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
$this->db->query("SELECT sql_text FROM fm_custom where
id={$custom_id}", __LINE__, __FILE__);
$this->db->next_record();
@@ -308,7 +309,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.sodocument.inc.php
===================================================================
--- trunk/property/inc/class.sodocument.inc.php 2016-08-10 11:07:08 UTC (rev
15443)
+++ trunk/property/inc/class.sodocument.inc.php 2016-08-10 11:07:49 UTC (rev
15444)
@@ -335,6 +335,7 @@
$doc_type = isset($data['doc_type']) &&
$data['doc_type'] ? $data['doc_type'] : 0;
$allrows = isset($data['allrows']) ?
$data['allrows'] : '';
$location_code = isset($data['location_code'])
? $data['location_code'] : '';
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
if (!$location_code && !($entity_id && $cat_id &&
$p_num))
@@ -394,7 +395,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.soevent.inc.php
===================================================================
--- trunk/property/inc/class.soevent.inc.php 2016-08-10 11:07:08 UTC (rev
15443)
+++ trunk/property/inc/class.soevent.inc.php 2016-08-10 11:07:49 UTC (rev
15444)
@@ -239,6 +239,7 @@
$sort = isset($data['sort']) && $data['sort'] ?
$data['sort'] : 'DESC';
$order = isset($data['order']) ? $data['order'] : '';
$allrows = isset($data['allrows']) ? $data['allrows'] :
'';
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
if (!isset($data['location_item_id']) ||
!$data['location_item_id'])
{
@@ -272,7 +273,7 @@
if (!$allrows)
{
- $this->_db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->_db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.sogab.inc.php
===================================================================
--- trunk/property/inc/class.sogab.inc.php 2016-08-10 11:07:08 UTC (rev
15443)
+++ trunk/property/inc/class.sogab.inc.php 2016-08-10 11:07:49 UTC (rev
15444)
@@ -69,6 +69,7 @@
$allrows = isset($data['allrows']) ?
$data['allrows'] : '';
$address = isset($data['address']) ?
$this->db->db_addslashes($data['address']) : '';
$check_payments =
isset($data['check_payments']) ? $data['check_payments'] : '';
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
switch ($order)
@@ -200,7 +201,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
@@ -325,6 +326,7 @@
$cat_id = (isset($data['cat_id']) ?
$data['cat_id'] : 0);
$gab_id = (isset($data['gab_id']) ?
$data['gab_id'] : '0');
$allrows = (isset($data['allrows']) ?
$data['allrows'] : '');
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
@@ -386,7 +388,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.soinvestment.inc.php
===================================================================
--- trunk/property/inc/class.soinvestment.inc.php 2016-08-10 11:07:08 UTC
(rev 15443)
+++ trunk/property/inc/class.soinvestment.inc.php 2016-08-10 11:07:49 UTC
(rev 15444)
@@ -75,6 +75,7 @@
$cat_id = (isset($data['cat_id']) ?
$data['cat_id'] : '');
$part_of_town_id =
(isset($data['part_of_town_id']) ? $data['part_of_town_id'] : '');
$allrows = (isset($data['allrows']) ?
$data['allrows'] : '');
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
if (!$cat_id)
{
@@ -142,7 +143,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql .
$ordermethod, $start, __LINE__, __FILE__);
+ $this->db->limit_query($sql .
$ordermethod, $start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.solookup.inc.php
===================================================================
--- trunk/property/inc/class.solookup.inc.php 2016-08-10 11:07:08 UTC (rev
15443)
+++ trunk/property/inc/class.solookup.inc.php 2016-08-10 11:07:49 UTC (rev
15444)
@@ -54,6 +54,7 @@
$allrows = isset($data['allrows']) ? $data['allrows'] :
'';
$role = isset($data['role']) ? $data['role'] : '';
$parent = isset($data['parent']) && $data['parent'] ?
(int)$data['parent'] : 0;
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
$join = '';
$filter_parent = '';
@@ -106,7 +107,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.sopending_action.inc.php
===================================================================
--- trunk/property/inc/class.sopending_action.inc.php 2016-08-10 11:07:08 UTC
(rev 15443)
+++ trunk/property/inc/class.sopending_action.inc.php 2016-08-10 11:07:49 UTC
(rev 15444)
@@ -232,6 +232,7 @@
$sort = isset($data['sort']) && $data['sort'] ?
$data['sort'] : 'DESC';
$order = isset($data['order']) ? $data['order'] : '';
$allrows = isset($data['allrows']) ? $data['allrows'] :
'';
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
if (!in_array($responsible_type,
$this->valid_responsible_types))
{
@@ -285,7 +286,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.sopricebook.inc.php
===================================================================
--- trunk/property/inc/class.sopricebook.inc.php 2016-08-10 11:07:08 UTC
(rev 15443)
+++ trunk/property/inc/class.sopricebook.inc.php 2016-08-10 11:07:49 UTC
(rev 15444)
@@ -200,6 +200,7 @@
$order = (isset($data['order']) ?
$data['order'] : '');
$cat_id = (isset($data['cat_id']) ?
$data['cat_id'] : 0);
$allrows = (isset($data['allrows']) ?
$data['allrows'] : '');
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
//_debug_array($data);
@@ -251,7 +252,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
@@ -303,6 +304,7 @@
$order = (isset($data['order']) ?
$data['order'] : '');
$cat_id = (isset($data['cat_id']) ?
$data['cat_id'] : 0);
$allrows = (isset($data['allrows']) ?
$data['allrows'] : '');
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
if ($order)
@@ -336,7 +338,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
@@ -384,6 +386,7 @@
$activity_id = isset($data['activity_id']) ?
$data['activity_id'] : 0;
$agreement_id = isset($data['agreement_id']) &&
$data['agreement_id'] ? $data['agreement_id'] : 0;
$allrows = isset($data['allrows']) ?
$data['allrows'] : '';
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
if ($order)
@@ -416,7 +419,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
@@ -458,6 +461,7 @@
$order = (isset($data['order']) ?
$data['order'] : '');
$cat_id = (isset($data['cat_id']) ?
$data['cat_id'] : 0);
$allrows = (isset($data['allrows']) ?
$data['allrows'] : '');
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
if ($order)
@@ -497,7 +501,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
@@ -535,6 +539,7 @@
$cat_id = isset($data['cat_id']) &&
$data['cat_id'] ? $data['cat_id'] : 0;
$allrows = isset($data['allrows']) ?
$data['allrows'] : '';
$activity_id = isset($data['activity_id']) ?
$data['activity_id'] : '';
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
if ($order)
@@ -574,7 +579,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.sorequest.inc.php
===================================================================
--- trunk/property/inc/class.sorequest.inc.php 2016-08-10 11:07:08 UTC (rev
15443)
+++ trunk/property/inc/class.sorequest.inc.php 2016-08-10 11:07:49 UTC (rev
15444)
@@ -309,6 +309,7 @@
$district_id = isset($data['district_id']) &&
$data['district_id'] ? $data['district_id'] : 0;
$project_id = isset($data['project_id']) ?
$data['project_id'] : '';
$allrows = isset($data['allrows']) ? $data['allrows'] :
'';
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
$list_descr = isset($data['list_descr']) ?
$data['list_descr'] : '';
$dry_run = isset($data['dry_run']) ? $data['dry_run'] :
'';
$p_num = isset($data['p_num']) ? $data['p_num'] : '';
@@ -815,7 +816,7 @@
{
if (!$allrows)
{
- $this->_db->limit_query($sql .
$ordermethod, $start, __LINE__, __FILE__);
+ $this->_db->limit_query($sql .
$ordermethod, $start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.soresponsible.inc.php
===================================================================
--- trunk/property/inc/class.soresponsible.inc.php 2016-08-10 11:07:08 UTC
(rev 15443)
+++ trunk/property/inc/class.soresponsible.inc.php 2016-08-10 11:07:49 UTC
(rev 15444)
@@ -569,6 +569,7 @@
$allrows = isset($data['allrows']) ?
!!$data['allrows'] : '';
$type_id = isset($data['type_id']) &&
$data['type_id'] ? (int)$data['type_id'] : 0;
$role_id = isset($data['role_id']) &&
$data['role_id'] ? (int)$data['role_id'] : 0;
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
if ($order)
@@ -607,7 +608,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.sos_agreement.inc.php
===================================================================
--- trunk/property/inc/class.sos_agreement.inc.php 2016-08-10 11:07:08 UTC
(rev 15443)
+++ trunk/property/inc/class.sos_agreement.inc.php 2016-08-10 11:07:49 UTC
(rev 15444)
@@ -609,6 +609,8 @@
{
$s_agreement_id =
(isset($data['s_agreement_id']) ? $data['s_agreement_id'] : 0);
$item_id = (isset($data['item_id']) ?
$data['item_id'] : 0);
+ $allrows = isset($data['allrows']) ?
!!$data['allrows'] : '';
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
$entity_table = 'fm_s_agreement_pricing';
@@ -674,7 +676,7 @@
$this->total_records = $this->db2->num_rows();
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
Modified: trunk/property/inc/class.sotemplate.inc.php
===================================================================
--- trunk/property/inc/class.sotemplate.inc.php 2016-08-10 11:07:08 UTC (rev
15443)
+++ trunk/property/inc/class.sotemplate.inc.php 2016-08-10 11:07:49 UTC (rev
15444)
@@ -153,6 +153,7 @@
$chapter_id = (isset($data['chapter_id']) ?
$data['chapter_id'] : 0);
$allrows = (isset($data['allrows']) ?
$data['allrows'] : '');
$template_id = (isset($data['template_id']) ?
$data['template_id'] : 0);
+ $results = isset($data['results']) ?
(int)$data['results'] : 0;
}
if ($order)
@@ -188,7 +189,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__,$results);
}
else
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15444] property: pagination,
sigurdne <=