[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.uigab.inc.php,1.5,1.6 class.s
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.uigab.inc.php,1.5,1.6 class.sogab.inc.php,1.6,1.7 class.bogab.inc.php,1.4,1.5 class.bodrawing.inc.php,1.6,1.7 |
|
Date: |
Fri, 27 Jun 2003 08:43:22 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv4199/inc
Modified Files:
class.uigab.inc.php class.sogab.inc.php class.bogab.inc.php
class.bodrawing.inc.php
Log Message:
no message
Index: class.uigab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uigab.inc.php 23 May 2003 08:40:19 -0000 1.5
--- class.uigab.inc.php 27 Jun 2003 12:43:19 -0000 1.6
***************
*** 35,43 ****
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
- $this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.bogab',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->config =
CreateObject('phpgwapi.config');
$this->start =
$this->bo->start;
--- 35,48 ----
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->bo =
CreateObject($this->currentapp.'.bogab',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->bolocation =
CreateObject($this->currentapp.'.bolocation');
+
$this->config =
CreateObject('phpgwapi.config');
+ $this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl_read =
$this->acl2->check('.location',1);
+ $this->acl_add =
$this->acl2->check('.location',2);
+ $this->acl_edit =
$this->acl2->check('.location',4);
+ $this->acl_delete =
$this->acl2->check('.location',8);
$this->start =
$this->bo->start;
***************
*** 75,79 ****
'nextmatchs'));
! $property_id =
get_var('property_id',array('POST','GET'));
$gaards_nr =
get_var('gaards_nr',array('POST','GET'));
$bruksnr =
get_var('bruksnr',array('POST','GET'));
--- 80,84 ----
'nextmatchs'));
! $location_code =
get_var('location_code',array('POST','GET'));
$gaards_nr =
get_var('gaards_nr',array('POST','GET'));
$bruksnr =
get_var('bruksnr',array('POST','GET'));
***************
*** 84,88 ****
if($reset_query)
{
! unset($property_id);
unset($gaards_nr);
unset($bruksnr);
--- 89,93 ----
if($reset_query)
{
! unset($location_code);
unset($gaards_nr);
unset($bruksnr);
***************
*** 93,97 ****
$links = $this->bocommon->menu();
! $gab_list =
$this->bo->read($property_id,$gaards_nr,$bruksnr,$feste_nr,$seksjons_nr);
//_debug_array($gab_list);
--- 98,102 ----
$links = $this->bocommon->menu();
! $gab_list =
$this->bo->read($location_code,$gaards_nr,$bruksnr,$feste_nr,$seksjons_nr);
//_debug_array($gab_list);
***************
*** 102,106 ****
(
'hits'
=> $gab['hits'],
- // 'address'
=> $gab['street_name'],
'address'
=> $gab['address'],
'gaards_nr'
=> substr($gab['gab_id'],4,5),
--- 107,110 ----
***************
*** 184,188 ****
'cat_id'
=>$this->cat_id,
'filter'
=>$this->filter,
! 'property_id' =>$property_id,
'gaards_nr'
=>$gaards_nr,
'bruksnr'
=>$bruksnr,
--- 188,192 ----
'cat_id'
=>$this->cat_id,
'filter'
=>$this->filter,
! 'location_code'
=>$location_code,
'gaards_nr'
=>$gaards_nr,
'bruksnr'
=>$bruksnr,
***************
*** 217,226 ****
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'property_id'
=> $property_id,
'gaards_nr'
=> $gaards_nr,
'bruksnr'
=> $bruksnr,
'feste_nr'
=> $feste_nr,
'seksjons_nr'
=> $seksjons_nr,
! 'lang_search_property_statustext' =>
lang('search by property_id. To show all entries, empty all fields and press
the SUBMIT button again'),
'lang_search_gaard_statustext' => lang('search
by gaards nr. To show all entries, empty all fields and press the SUBMIT button
again'),
'lang_search_bruk_statustext' => lang('search
by bruk. To show all entries, empty all fields and press the SUBMIT button
again'),
--- 221,230 ----
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'location_code'
=> $location_code,
'gaards_nr'
=> $gaards_nr,
'bruksnr'
=> $bruksnr,
'feste_nr'
=> $feste_nr,
'seksjons_nr'
=> $seksjons_nr,
! 'lang_search_location_statustext' =>
lang('search by location_code. To show all entries, empty all fields and press
the SUBMIT button again'),
'lang_search_gaard_statustext' => lang('search
by gaards nr. To show all entries, empty all fields and press the SUBMIT button
again'),
'lang_search_bruk_statustext' => lang('search
by bruk. To show all entries, empty all fields and press the SUBMIT button
again'),
***************
*** 245,249 ****
function list_detail()
{
! $GLOBALS['phpgw']->xslttpl->add_file(array('gab',
'menu',
'nextmatchs'));
--- 249,258 ----
function list_detail()
{
! if(!$this->acl_read)
! {
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uigab.index');
! }
!
!
$GLOBALS['phpgw']->xslttpl->add_file(array('gab','values','table_header',
'menu',
'nextmatchs'));
***************
*** 255,300 ****
$gab_list = $this->bo->read_detail($gab_id);
! while (is_array($gab_list) && list(,$gab) =
each($gab_list))
{
! $content[] = array
(
! 'property_id'
=> $gab['property_id'],
! 'building_id'
=> $gab['building_id'],
! 'entrance_id'
=> $gab['entrance_id'],
! 'address'
=> $gab['street_name'],
! 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.view&gab_id='
. $gab['gab_id'] . '&location_code=' . $gab['location_code']),
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.edit&gab_id='
. $gab['gab_id'] . '&location_code=' . $gab['location_code'] .
'&from=list_detail'),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.delete&gab_id='
. $gab['gab_id'] . '&location_code=' . $gab['location_code']),
! 'lang_view_file_statustext' =>
lang('view the gab'),
! 'lang_view_statustext' =>
lang('view information about the gab'),
! 'lang_edit_statustext' =>
lang('edit information about the gab'),
! 'lang_delete_statustext' =>
lang('delete this gab'),
! 'text_view'
=> lang('view'),
! 'text_edit'
=> lang('edit'),
! 'text_delete'
=> lang('delete')
);
}
- $table_header[] = array
- (
- 'lang_property' => lang('Property'),
- 'lang_building' => lang('Building'),
- 'lang_entrance' => lang('Entrance'),
- 'lang_address' => lang('Address'),
- 'lang_gaards_nr' => lang('gaards nr'),
- 'lang_bruksnr' => lang('bruks nr'),
- 'lang_feste_nr' => lang('Feste nr'),
- 'lang_seksjons_nr' => lang('Seksjons nr'),
- 'lang_view' => lang('view'),
- 'lang_edit' => lang('edit'),
- 'lang_delete' => lang('delete')
- );
- $table_add[] = array
- (
- 'lang_add' =>
lang('add'),
- 'lang_add_statustext' => lang('add a gab'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.edit&from=list_detail&gab_id='
. $gab_id . '&new=true')
- );
$table_done[] = array
(
--- 264,414 ----
$gab_list = $this->bo->read_detail($gab_id);
!
! $uicols = $this->bo->uicols;
!
! $j=0;
! while (is_array($gab_list) && list(,$gab_entry) =
each($gab_list))
{
! for ($k=0;$k<count($uicols['name']);$k++)
! {
! if($uicols['input_type'][$k]!='hidden')
! {
!
$content[$j]['row'][$k]['value'] =
$gab_entry[$uicols['name'][$k]];
! $content[$j]['row'][$k]['name']
= $uicols['name'][$k];
! }
! }
!
! if(!$lookup)
! {
! if($this->acl_read)
! {
!
$content[$j]['row'][$k]['statustext'] = lang('view the gab');
! $content[$j]['row'][$k]['text']
= lang('view');
! $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.view&gab_id='
. $gab_entry['gab_id'] . '&location_code=' . $gab_entry['location_code']);
! $k++;
! }
!
! if($this->acl_edit)
! {
!
$content[$j]['row'][$k]['statustext'] = lang('edit the gab');
! $content[$j]['row'][$k]['text']
= lang('edit');
! $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.edit&gab_id='
. $gab_entry['gab_id'] . '&location_code=' . $gab_entry['location_code'] .
'&from=list_detail');
! $k++;
! }
!
! if($this->acl_delete)
! {
!
$content[$j]['row'][$k]['statustext'] = lang('delete the
gab');
! $content[$j]['row'][$k]['text']
= lang('delete');
! $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.delete&gab_id='
. $gab_entry['gab_id'] . '&location_code=' . $gab_entry['location_code']);
! $k++;
! }
! }
!
! $j++;
! }
!
! for ($i=0;$i<count($uicols['descr']);$i++)
! {
! if($uicols['input_type'][$i]!='hidden')
! {
! $table_header[$i]['header'] =
$uicols['descr'][$i];
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! if($uicols['name'][$i]=='loc1')
! {
! $table_header[$i]['sort_link']
=true;
! $table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
!
(
!
'sort' => $this->sort,
!
'var' => 'location_code',
!
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uigab.index',
!
'type_id'
=>$type_id,
!
'query'
=>$this->query,
!
'lookup'
=>$lookup,
!
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
!
));
! }
! if($uicols['name'][$i]=='gab_id')
! {
! $table_header[$i]['sort_link']
=true;
! $table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
!
(
!
'sort' => $this->sort,
!
'var' => 'gab_id',
!
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uigab.index',
!
'type_id'
=>$type_id,
!
'query'
=>$this->query,
!
'lookup'
=>$lookup,
!
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
!
));
! }
! if($uicols['name'][$i]=='address')
! {
! $table_header[$i]['sort_link']
=true;
! $table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
!
(
!
'sort' => $this->sort,
!
'var' => 'address',
!
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uigab.index',
!
'type_id'
=>$type_id,
!
'query'
=>$this->query,
!
'lookup'
=>$lookup,
!
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
!
));
! }
! }
! }
!
! if(!$lookup)
! {
! if($this->acl_read)
! {
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header']
= lang('view');
! $i++;
! }
! if($this->acl_edit)
! {
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header']
= lang('edit');
! $i++;
! }
! if($this->acl_delete)
! {
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header']
= lang('delete');
! $i++;
! }
! }
! else
! {
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header'] =
lang('select');
! }
!
! //_debug_array($content);
! if($this->acl_add)
! {
! $table_add[] = array
(
! 'lang_add'
=> lang('add'),
! 'lang_add_statustext' => lang('add a
gab'),
! 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uigab.edit')
!
);
}
$table_done[] = array
(
***************
*** 344,349 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
! 'table_header_gab_detail' =>
$table_header,
! 'values_gab_detail'
=> $content,
'table_add'
=> $table_add,
'table_done'
=> $table_done
--- 458,463 ----
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
! 'table_header'
=> $table_header,
! 'values'
=> $content,
'table_add'
=> $table_add,
'table_done'
=> $table_done
***************
*** 361,364 ****
--- 475,483 ----
function edit()
{
+ if(!$this->acl_add && !$this->acl_edit)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uigab.index');
+ }
+
$from =
get_var('from',array('POST','GET'));
$new =
get_var('new',array('POST','GET'));
***************
*** 366,369 ****
--- 485,489 ----
$location_code =
get_var('location_code',array('POST','GET'));
$values =
get_var('values',array('POST'));
+ $insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
$GLOBALS['phpgw']->xslttpl->add_file(array('gab'));
***************
*** 377,383 ****
if($location_code)
{
!
$location_data=$this->bocommon->read_location_data($location_code);
!
! $values = $location_data;
}
}
--- 497,501 ----
if($location_code)
{
! $values['location_data'] =
$this->bolocation->read_single($location_code,$values['extra']);
}
}
***************
*** 388,393 ****
{
$values['gab_id'] = $gab_id;
! $values['location_code'] = $location_code;
if(!$receipt['error'])
--- 506,532 ----
{
+ for ($i=0;
$i<count($insert_record['location']); $i++)
+ {
+
if($_POST[$insert_record['location'][$i]])
+ {
+
$values['location'][$insert_record['location'][$i]]=
$_POST[$insert_record['location'][$i]];
+ }
+ }
+
+ while (is_array($insert_record['extra']) &&
list($key,) = each($insert_record['extra']))
+ {
+ if($_POST[$key])
+ {
+ $values['extra'][$key] =
$_POST[$key];
+ }
+ }
+
+ $values['street_name'] =
$_POST['street_name'];
+ $values['street_number'] =
$_POST['street_number'];
+ $values['location_name'] = $_POST['loc'
. (count($values['location'])).'_name']; // if not address - get the parent
name as address
+
$values['gab_id'] = $gab_id;
!
! // $values['location_code'] = $location_code;
if(!$receipt['error'])
***************
*** 424,440 ****
!
$location_data=$this->bocommon->initiate_ui_location(array(
! 'location_type' =>
$location_type,
! 'entrance' => true,
! 'address' => true,
! 'equipment_id' =>
$values['equipment_id'],
! 'property_id' =>
$values['property_id'],
! 'property_name' =>
$values['property_name'],
! 'building_id' =>
$values['building_id'],
! 'entrance_id' =>
$values['entrance_id'],
! 'floor' =>
$values['floor'],
! 'street_name' =>
$values['street_name'],
! 'street_number' =>
$values['street_number'],
! 'apartment_id' =>
$values['apartment_id']));
$link_data = array
--- 563,574 ----
!
$location_data=$this->bolocation->initiate_ui_location(array(
! 'values' =>
$values['location_data'],
! 'type_id' => -1,
// calculated from location_types
! 'no_link' =>
False, // disable lookup links for location type less than type_id
! 'tenant' =>
False,
! 'equipment' =>
False,
! 'lookup_type' => 'form'
! ));
$link_data = array
***************
*** 502,505 ****
--- 636,644 ----
function delete()
{
+ if(!$this->acl_delete)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uigab.index');
+ }
+
$gab_id = get_var('gab_id',array('POST','GET'));
$location_code =
get_var('location_code',array('POST','GET'));
***************
*** 540,543 ****
--- 679,687 ----
function view()
{
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uigab.index');
+ }
+
$gab_id =
get_var('gab_id',array('POST','GET'));
$location_code =
get_var('location_code',array('POST','GET'));
***************
*** 557,573 ****
!
$location_data=$this->bocommon->initiate_ui_location(array(
! 'location_type' =>
$location_type,
! 'entrance' => true,
! 'address' => true,
! 'equipment_id' =>
$values['equipment_id'],
! 'property_id' =>
$values['property_id'],
! 'property_name' =>
$values['property_name'],
! 'building_id' =>
$values['building_id'],
! 'entrance_id' =>
$values['entrance_id'],
! 'floor' =>
$values['floor'],
! 'street_name' =>
$values['street_name'],
! 'street_number' =>
$values['street_number'],
! 'apartment_id' =>
$values['apartment_id']));
$data = array
--- 701,713 ----
!
$location_data=$this->bolocation->initiate_ui_location(array(
! 'values' =>
$values['location_data'],
! 'type_id' =>
count(explode('-',$values['location_code'])),
! 'no_link' =>
False, // disable lookup links for location type less than type_id
! 'tenant' =>
False,
! 'equipment' =>
False,
! 'lookup_type' => 'view'
! ));
!
$data = array
Index: class.sogab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sogab.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.sogab.inc.php 30 May 2003 10:43:03 -0000 1.6
--- class.sogab.inc.php 27 Jun 2003 12:43:19 -0000 1.7
***************
*** 16,30 ****
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 16,24 ----
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
***************
*** 150,153 ****
--- 144,160 ----
}
+
+ $entity_table = 'fm_gab_location';
+
+ $cols .= $entity_table . '.location_code';
+ $cols_return[] = 'location_code';
+ $cols .= ',gab_id';
+ $cols_return[] = 'gab_id';
+
+
+ $sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols'=>$cols,'cols_return'=>$cols_return,
+
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query));
+
+
if ($order)
{
***************
*** 171,176 ****
}
- $sql = "select location_code, gab_id FROM
fm_gab_location $filtermethod";
$this->db2->query($sql,__LINE__,__FILE__);
--- 178,188 ----
}
+ $sql .= " $filtermethod ";
+ //echo $sql;
+ $this->uicols = $this->bocommon->uicols;
+ $cols_return = $this->bocommon->cols_return;
+ $type_id =
$this->bocommon->type_id;
+ $this->cols_extra = $this->bocommon->cols_extra;
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 186,196 ****
}
while ($this->db->next_record())
{
! $gab_list[] = array
! (
! 'gab_id' =>
$this->db->f('gab_id'),
! 'location_code' =>
$this->db->f('location_code')
! );
}
return $gab_list;
--- 198,218 ----
}
+ $j=0;
while ($this->db->next_record())
{
! for ($i=0;$i<count($cols_return);$i++)
! {
! $gab_list[$j][$cols_return[$i]] =
$this->db->f($cols_return[$i]);
! }
!
! $location_code= $this->db->f('location_code');
! $location = split('-',$location_code);
! for ($m=0;$m<count($location);$m++)
! {
! $gab_list[$j]['loc' . ($m+1)] =
$location[$m];
! $gab_list[$j]['query_location']['loc' .
($m+1)]=implode("-", array_slice($location, 0, ($m+1)));
! }
!
! $j++;
}
return $gab_list;
***************
*** 205,209 ****
if ($this->db->next_record())
{
! $gab['location_code'] =
$this->db->f('location_code');
$gab['remark'] =
$this->db->f('remark');
}
--- 227,231 ----
if ($this->db->next_record())
{
! $gab['location_code'] =
$location_code;
$gab['remark'] =
$this->db->f('remark');
}
Index: class.bogab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bogab.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.bogab.inc.php 23 May 2003 08:40:19 -0000 1.4
--- class.bogab.inc.php 27 Jun 2003 12:43:19 -0000 1.5
***************
*** 29,34 ****
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->so =
CreateObject($this->currentapp.'.sogab');
- $this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
if ($session)
--- 29,34 ----
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->so =
CreateObject($this->currentapp.'.sogab');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->solocation =
CreateObject($this->currentapp.'.solocation');
if ($session)
***************
*** 112,121 ****
'gaards_nr' => $gaards_nr,'bruksnr' => $bruksnr,'feste_nr' =>
$feste_nr,'seksjons_nr' => $seksjons_nr,));
$this->total_records = $this->so->total_records;
- /* for ($i=0;$i<count($gab);$i++)
- {
-
$location_data=$this->socommon->read_location_data($gab[$i]['location_code']);
- $gab[$i]=$gab[$i] + $location_data;
- }
- */
return $gab;
}
--- 112,115 ----
***************
*** 127,134 ****
$this->total_records = $this->so->total_records;
! for ($i=0;$i<count($gab);$i++)
{
!
$location_data=$this->socommon->read_location_data($gab[$i]['location_code']);
! $gab[$i]=$gab[$i] + $location_data;
}
--- 121,136 ----
$this->total_records = $this->so->total_records;
! $this->uicols = $this->so->uicols;
! $cols_extra = $this->so->cols_extra;
!
!
! for ($i=0; $i<count($gab); $i++)
{
!
$location_data=$this->solocation->read_single($gab[$i]['location_code']);
!
! for ($j=0;$j<count($cols_extra);$j++)
! {
! $gab[$i][$cols_extra[$j]] =
$location_data[$cols_extra[$j]];
! }
}
***************
*** 140,148 ****
$gab = $this->so->read_single($gab_id,$location_code);
!
$location_data=$this->socommon->read_location_data($gab['location_code']);
!
! if($gab)
{
! $gab=$gab + $location_data;
}
--- 142,148 ----
$gab = $this->so->read_single($gab_id,$location_code);
! if($gab['location_code'])
{
! $gab['location_data']
=$this->solocation->read_single($gab['location_code']);
}
Index: class.bodrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bodrawing.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.bodrawing.inc.php 27 Jun 2003 11:14:51 -0000 1.6
--- class.bodrawing.inc.php 27 Jun 2003 12:43:19 -0000 1.7
***************
*** 283,287 ****
$drawing['drawing_date'] =
$GLOBALS['phpgw']->common->show_date($drawing['drawing_date'],$dateformat);
$vendor
=
$this->contacts->read_single_entry($drawing['vendor_id'],array('org_name'=>'org_name','email'=>'email'));
! $drawing['vendor_name'] =
$vendor[0]['org_name'];
$drawing['vendor_email'] =
$vendor[0]['email'];
--- 283,287 ----
$drawing['drawing_date'] =
$GLOBALS['phpgw']->common->show_date($drawing['drawing_date'],$dateformat);
$vendor
=
$this->contacts->read_single_entry($drawing['vendor_id'],array('org_name'=>'org_name','email'=>'email'));
! $drawing['vendor_name'] =
$vendor[0]['org_name'];
$drawing['vendor_email'] =
$vendor[0]['email'];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.uigab.inc.php,1.5,1.6 class.sogab.inc.php,1.6,1.7 class.bogab.inc.php,1.4,1.5 class.bodrawing.inc.php,1.6,1.7,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.101,1.102
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc class.uigab.inc.php,1.6,1.7 class.sogab.inc.php,1.7,1.8 class.bogab.inc.php,1.5,1.6
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.101,1.102
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc class.uigab.inc.php,1.6,1.7 class.sogab.inc.php,1.7,1.8 class.bogab.inc.php,1.5,1.6
- Index(es):