|
| From: | Sigurd Nes |
| Subject: | [Phpgroupware-cvs] property/inc class.boentity.inc.php class.uient... |
| Date: | Wed, 20 Sep 2006 08:41:47 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/20 08:41:47
Modified files:
inc : class.boentity.inc.php class.uientity.inc.php
class.uilocation.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boentity.inc.php?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uientity.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uilocation.inc.php?cvsroot=phpgroupware&r1=1.33&r2=1.34
Patches:
Index: class.boentity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boentity.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.boentity.inc.php 13 Sep 2006 18:29:16 -0000 1.20
+++ class.boentity.inc.php 20 Sep 2006 08:41:47 -0000 1.21
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage entity
- * @version $Id: class.boentity.inc.php,v 1.20 2006/09/13 18:29:16
sigurdne Exp $
+ * @version $Id: class.boentity.inc.php,v 1.21 2006/09/20 08:41:47
sigurdne Exp $
*/
/**
@@ -79,6 +79,8 @@
$status = get_var('status',array('POST','GET'));
$start_date =
get_var('start_date',array('POST','GET'));
$end_date =
get_var('end_date',array('POST','GET'));
+ $allrows =
get_var('allrows',array('POST','GET'));
+
$this->soadmin_entity =
CreateObject($this->currentapp.'.soadmin_entity',$entity_id,$cat_id);
$this->so =
CreateObject($this->currentapp.'.soentity',$entity_id,$cat_id);
@@ -92,28 +94,27 @@
{
$this->start=0;
}
- if(array_key_exists('query',$_POST) ||
array_key_exists('query',$_GET) )
+ if(isset($_POST['query']) || isset($_GET['query']))
{
$this->query = $query;
}
- if(array_key_exists('filter',$_POST))
+ if(isset($_POST['filter']) || isset($_GET['filter']))
{
$this->filter = $filter;
}
- if(array_key_exists('sort',$_POST))
+ if(isset($_POST['sort']) || isset($_GET['sort']))
{
$this->sort = $sort;
}
- if(array_key_exists('order',$_POST))
+ if(isset($_POST['order']) || isset($_GET['order']))
{
$this->order = $order;
}
- // if(array_key_exists('cat_id',$_POST) ||
array_key_exists('cat_id',$_GET) )
- if($cat_id)
+ if(isset($_POST['cat_id']) || isset($_GET['cat_id']))
{
$this->cat_id = $cat_id;
}
- if(array_key_exists('district_id',$_POST))
+ if(isset($_POST['district_id']) ||
isset($_GET['district_id']))
{
$this->district_id = $district_id;
}
@@ -121,18 +122,22 @@
{
$this->entity_id = $entity_id;
}
- if(array_key_exists('status',$_POST))
+ if(isset($_POST['status']) || isset($_GET['status']))
{
$this->status = $status;
}
- if(array_key_exists('start_date',$_POST))
+ if(isset($_POST['start_date']) ||
isset($_GET['start_date']))
{
$this->start_date = $start_date;
}
- if(array_key_exists('end_date',$_POST))
+ if(isset($_POST['end_date']) ||
isset($_GET['end_date']))
{
$this->end_date = $end_date;
}
+ if($allrows)
+ {
+ $this->allrows = $allrows;
+ }
}
function save_sessiondata($data)
@@ -152,12 +157,11 @@
$this->filter = $data['filter'];
$this->sort = $data['sort'];
$this->order = $data['order'];
- // $this->cat_id = $data['cat_id'];
$this->district_id = $data['district_id'];
- // $this->entity_id = $data['entity_id'];
$this->status = $data['status'];
$this->start_date = $data['start_date'];
$this->end_date = $data['end_date'];
+ //$this->allrows = $data['allrows'];
}
function
column_list($selected='',$entity_id='',$cat_id,$allrows='')
@@ -212,6 +216,11 @@
function read($data='')
{
+ if(isset($this->allrows))
+ {
+ $data['allrows'] = true;
+ }
+
$entity = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
'filter' => $this->filter,'cat_id' => $this->cat_id,'district_id' =>
$this->district_id,
'lookup'=>$data['lookup'],'allrows'=>$data['allrows'],'entity_id'=>$this->entity_id,'cat_id'=>$this->cat_id,'status'=>$this->status,
Index: class.uientity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.uientity.inc.php 18 Sep 2006 13:11:35 -0000 1.25
+++ class.uientity.inc.php 20 Sep 2006 08:41:47 -0000 1.26
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage entity
- * @version $Id: class.uientity.inc.php,v 1.25 2006/09/18 13:11:35
sigurdne Exp $
+ * @version $Id: class.uientity.inc.php,v 1.26 2006/09/20 08:41:47
sigurdne Exp $
*/
/**
@@ -84,6 +84,7 @@
$GLOBALS['phpgw']->session->appsession('entity_id',$this->currentapp,$this->entity_id);
$this->start_date =
$this->bo->start_date;
$this->end_date =
$this->bo->end_date;
+ $this->allrows =
$this->bo->allrows;
}
function save_sessiondata()
@@ -101,7 +102,8 @@
'entity_id' => $this->entity_id,
'status' => $this->status,
'start_date' => $this->start_date,
- 'end_date' => $this->end_date
+ 'end_date' => $this->end_date,
+ 'allrows' => $this->allrows,
);
$this->bo->save_sessiondata($data);
}
@@ -160,10 +162,10 @@
function columns()
{
-
$GLOBALS['phpgw']->xslttpl->add_file(array('columns'));
$GLOBALS['phpgw_info']['flags']['noframework'] = True;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = True;
$values =
get_var('values',array('POST','GET'));
@@ -438,6 +440,15 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('search_field'));
}
+ if(!$this->allrows)
+ {
+ $record_limit =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ }
+ else
+ {
+ $record_limit = $this->bo->total_records;
+ }
+
$data = array
(
'group_filters' =>
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters'],
@@ -459,9 +470,10 @@
'overlib_source' =>
'./'.$this->currentapp.'/inc/overlib.js',
'links' =>
$links,
- 'allow_allrows' =>
false,
+ 'allow_allrows' => true,
+ 'allrows' =>
$this->allrows,
'start_record' =>
$this->start,
- 'record_limit' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
+ 'record_limit' =>
$record_limit,
'num_records' =>
count($entity_list),
'all_records' =>
$this->bo->total_records,
'link_url' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
Index: class.uilocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- class.uilocation.inc.php 18 Sep 2006 09:08:04 -0000 1.33
+++ class.uilocation.inc.php 20 Sep 2006 08:41:47 -0000 1.34
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage location
- * @version $Id: class.uilocation.inc.php,v 1.33 2006/09/18 09:08:04
sigurdne Exp $
+ * @version $Id: class.uilocation.inc.php,v 1.34 2006/09/20 08:41:47
sigurdne Exp $
*/
/**
@@ -86,7 +86,7 @@
'district_id' => $this->district_id,
'status' =>
$this->status,
'type_id' =>
$this->type_id,
- 'allrows' =>
$this->allrows
+ // 'allrows' => $this->allrows
);
$this->bo->save_sessiondata($data);
}
@@ -252,14 +252,14 @@
'var' => 'fm_location1.loc1',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilocation.index',
-
'type_id'
=>$type_id,
-
'query'
=>$this->query,
-
'district_id'
=>$this->district_id,
-
'part_of_town_id'
=>$this->part_of_town_id,
-
'lookup'
=>$lookup,
-
'lookup_tenant'
=>$lookup_tenant,
-
'lookup_name'
=>$lookup_name,
-
'cat_id'
=>$this->cat_id,
+
'type_id'
=> $type_id,
+
'query'
=> $this->query,
+
'district_id'
=> $this->district_id,
+
'part_of_town_id'
=> $this->part_of_town_id,
+
'lookup'
=> $lookup,
+
'lookup_tenant'
=> $lookup_tenant,
+
'lookup_name'
=> $lookup_name,
+
'cat_id'
=> $this->cat_id,
'status'
=> $this->status)
));
}
@@ -272,14 +272,14 @@
'var' => 'street_name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilocation.index',
-
'type_id'
=>$type_id,
-
'query'
=>$this->query,
-
'district_id'
=>$this->district_id,
-
'part_of_town_id'
=>$this->part_of_town_id,
-
'lookup'
=>$lookup,
-
'lookup_tenant'
=>$lookup_tenant,
-
'lookup_name'
=>$lookup_name,
-
'cat_id'
=>$this->cat_id,
+
'type_id'
=> $type_id,
+
'query'
=> $this->query,
+
'district_id'
=> $this->district_id,
+
'part_of_town_id'
=> $this->part_of_town_id,
+
'lookup'
=> $lookup,
+
'lookup_tenant'
=> $lookup_tenant,
+
'lookup_name'
=> $lookup_name,
+
'cat_id'
=> $this->cat_id,
'status'
=> $this->status)
));
}
@@ -334,17 +334,17 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uilocation.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
- 'part_of_town_id'
=>$this->part_of_town_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'lookup'
=>$lookup,
- 'lookup_tenant'
=>$lookup_tenant,
- 'lookup_name'
=>$lookup_name,
- 'type_id'
=>$type_id,
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'district_id' => $this->district_id,
+ 'part_of_town_id' =>
$this->part_of_town_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query,
+ 'lookup' => $lookup,
+ 'lookup_tenant' => $lookup_tenant,
+ 'lookup_name' => $lookup_name,
+ 'type_id' => $type_id,
'status' =>
$this->status
);
@@ -373,19 +373,19 @@
$link_excel = array
(
'menuaction' =>
$this->currentapp.'.uilocation.excel',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
- 'part_of_town_id'
=>$this->part_of_town_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'lookup'
=>$lookup,
- 'lookup_tenant'
=>$lookup_tenant,
- 'lookup_name'
=>$lookup_name,
- 'type_id'
=>$type_id,
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'district_id' => $this->district_id,
+ 'part_of_town_id' =>
$this->part_of_town_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query,
+ 'lookup' => $lookup,
+ 'lookup_tenant' => $lookup_tenant,
+ 'lookup_name' => $lookup_name,
+ 'type_id' => $type_id,
'status' =>
$this->status,
- 'start'
=>$this->start
+ 'start' => $this->start
);
if(!$this->allrows)
@@ -423,6 +423,7 @@
'lang_property_name' =>
lang('Property name'),
'links' =>
$links,
'allow_allrows' => True,
+ 'allrows' =>
$this->allrows,
'start_record' =>
$this->start,
'record_limit' =>
$record_limit,
'num_records' =>
count($location_list),
| [Prev in Thread] | Current Thread | [Next in Thread] |