[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.menu.inc.php, 1.4, 1.5 class.uidoc
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc class.menu.inc.php, 1.4, 1.5 class.uidocument.inc.php, 1.21, 1.22 class.sodocument.inc.php, 1.16, 1.17 class.bodocument.inc.php, 1.12, 1.13 |
|
Date: |
Sun, 23 Nov 2003 19:22:11 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv11969/inc
Modified Files:
class.menu.inc.php class.uidocument.inc.php
class.sodocument.inc.php class.bodocument.inc.php
Log Message:
no message
Index: class.sodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodocument.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** class.sodocument.inc.php 23 Nov 2003 17:41:35 -0000 1.16
--- class.sodocument.inc.php 23 Nov 2003 19:22:09 -0000 1.17
***************
*** 93,97 ****
$order =
(isset($data['order'])?$data['order']:'');
$cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
- $equipment_type =
(isset($data['equipment_type'])?$data['equipment_type']:'');
$entity_id =
(isset($data['entity_id'])?$data['entity_id']:'');
}
--- 93,96 ----
***************
*** 108,135 ****
$groupmethod= " GROUP BY
fm_document.location_code,fm_document.address ";
- if ($cat_id == 'equipment')
- {
- $cols .= ",$document_table.equipment_id";
- $cols_return[] =
'equipment_id';
- $uicols['input_type'][] = 'text';
- $uicols['name'][] =
'equipment_id';
- $uicols['descr'][] =
lang('Equipment ID');
- $uicols['statustext'][] =
lang('Equipment ID');
-
- $cols .= ',fm_equipment_type.name as
equipment_type';
- $cols_return[] =
'equipment_type';
- $uicols['input_type'][] = 'text';
- $uicols['name'][] =
'equipment_type';
- $uicols['descr'][] =
lang('Type');
- $uicols['statustext'][] =
lang('Equipment Type');
-
- $joinmethod .= " $this->join fm_equipment ON
($document_table.equipment_id = fm_equipment.equipment_id))";
- $paranthesis .='(';
- $joinmethod .= " $this->join fm_equipment_type
ON (fm_equipment.equipment_type_id = fm_equipment_type.id))";
- $paranthesis .='(';
-
- $groupmethod.= "
,fm_equipment_type.name,fm_document.equipment_id ";
- }
-
if ($entity_id)
{
--- 107,110 ----
***************
*** 176,199 ****
$where= 'WHERE';
! if ($cat_id == 'equipment'):
! {
! $filtermethod .= " $where
(fm_document.equipment_id is not NULL AND fm_document.equipment_id !='')";
! }
! elseif (!$entity_id):
{
$filtermethod .= " $where ( fm_document.p_num
is NULL OR fm_document.p_num='') ";
! }
! else:
! {
! // $filtermethod .= " $where
fm_document.location_code is NULL ";
! }
! endif;
!
! $where= 'AND';
!
!
! if ($equipment_type)
! {
! $filtermethod .= " $where
fm_equipment.equipment_type_id ='$equipment_type' ";
}
--- 151,158 ----
$where= 'WHERE';
! if(!$entity_id)
{
$filtermethod .= " $where ( fm_document.p_num
is NULL OR fm_document.p_num='') ";
! $where= 'AND';
}
***************
*** 266,270 ****
$cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
$location_code =
(isset($data['location_code'])?$data['location_code']:'');
- $equipment_id =
(isset($data['equipment_id'])?$data['equipment_id']:'');
}
--- 225,228 ----
***************
*** 279,286 ****
$filtermethod = "
fm_document.location_code='$location_code'";
- if ($equipment_id)
- {
- $filtermethod .= " AND
fm_document.equipment_id='$equipment_id' ";
- }
if ($cat_id > 0)
--- 237,240 ----
***************
*** 414,418 ****
$document['descr'],
$document['location_code'],
- $document['equipment_id'],
$address,
$document['branch_id'],
--- 368,371 ----
***************
*** 423,427 ****
$this->db->query("INSERT INTO fm_document
(document_name,link,title,access,category,entry_date,document_date,version,coordinator,status,"
! .
"descr,location_code,equipment_id,address,branch_id,vendor_id,user_id $cols) "
. "VALUES ($values $vals )",__LINE__,__FILE__);
--- 376,380 ----
$this->db->query("INSERT INTO fm_document
(document_name,link,title,access,category,entry_date,document_date,version,coordinator,status,"
! .
"descr,location_code,address,branch_id,vendor_id,user_id $cols) "
. "VALUES ($values $vals )",__LINE__,__FILE__);
***************
*** 473,477 ****
}
! $this->db->query("SELECT
status,category,coordinator,document_name,equipment_id,loc1,link FROM
fm_document where id='" .$document['document_id']."'",__LINE__,__FILE__);
$this->db->next_record();
--- 426,430 ----
}
! $this->db->query("SELECT
status,category,coordinator,document_name,loc1,link FROM fm_document where
id='" .$document['document_id']."'",__LINE__,__FILE__);
$this->db->next_record();
***************
*** 480,484 ****
$old_coordinator = $this->db->f('coordinator');
$old_document_name = $this->db->f('document_name');
- $old_equipment_id = $this->db->f('equipment_id');
$old_loc1 = $this->db->f('loc1');
$old_link = $this->db->f('link');
--- 433,436 ----
***************
*** 552,556 ****
'version' =>$document['version'],
'location_code' =>$document['location_code'],
- 'equipment_id' =>$document['equipment_id'],
'vendor_id'
=>$document['vendor_id'],
'address' =>$address
--- 504,507 ----
Index: class.menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.menu.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** class.menu.inc.php 23 Nov 2003 17:41:35 -0000 1.4
--- class.menu.inc.php 23 Nov 2003 19:22:09 -0000 1.5
***************
*** 202,209 ****
$menu['sub_menu'][$i]['name']
= lang('location');
$menu['sub_menu'][$i]['statustext']
= lang('Documentation for locations');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index&cat_id=equipment');
- $menu['sub_menu'][$i]['name']
= lang('Equipment');
- $menu['sub_menu'][$i]['statustext']
= lang('Documentation for equipment');
if (isset($entity_list) AND
is_array($entity_list))
--- 202,205 ----
Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** class.uidocument.inc.php 23 Nov 2003 17:41:35 -0000 1.21
--- class.uidocument.inc.php 23 Nov 2003 19:22:09 -0000 1.22
***************
*** 59,63 ****
$this->cat_id =
$this->bo->cat_id;
$this->status_id =
$this->bo->status_id;
- $this->equipment_type =
$this->bo->equipment_type;
$this->entity_id =
$this->bo->entity_id;
$this->doc_type =
$this->bo->doc_type;
--- 59,62 ----
***************
*** 77,81 ****
'cat_id' => $this->cat_id,
'status_id' => $this->status_id,
- 'equipment_type' =>
$this->equipment_type,
'entity_id' => $this->entity_id,
'doc_type' => $this->doc_type
--- 76,79 ----
***************
*** 112,116 ****
$this->cat_id =
$this->bo->cat_id;
$this->status_id =
$this->bo->status_id;
- $this->equipment_type =
$this->bo->equipment_type;
$this->entity_id =
$this->bo->entity_id;
}
--- 110,113 ----
***************
*** 135,139 ****
$content[$j]['row'][$k]['statustext'] = lang('search');
$content[$j]['row'][$k]['text'] =
$document_entry[$uicols['name'][$k]];
!
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.index&query='
. $document_entry['query_location'][$uicols['name'][$k]] . '&lookup=' .
$lookup . '&cat_id=' . $this->cat_id);
}
else
--- 132,136 ----
$content[$j]['row'][$k]['statustext'] = lang('search');
$content[$j]['row'][$k]['text'] =
$document_entry[$uicols['name'][$k]];
!
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.index&query='
. $document_entry['query_location'][$uicols['name'][$k]] . '&lookup=' .
$lookup . '&entity_id=' . $document_entry['p_entity_id'] . '&cat_id=' .
$document_entry['p_cat_id']);
}
else
***************
*** 150,154 ****
if($this->acl_read)
{
!
$content[$j]['row'][$k]['statustext'] = lang('view documents
for this location/equipment');
$content[$j]['row'][$k]['text']
= lang('documents');
$content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&location_code='
. $document_entry['location_code'] . '&p_num=' . $document_entry['p_num'] .
'&entity_id=' . $document_entry['p_entity_id'] . '&cat_id=' .
$document_entry['p_cat_id']);
--- 147,151 ----
if($this->acl_read)
{
!
$content[$j]['row'][$k]['statustext'] = lang('view documents
for this location/entity');
$content[$j]['row'][$k]['text']
= lang('documents');
$content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&location_code='
. $document_entry['location_code'] . '&p_num=' . $document_entry['p_num'] .
'&entity_id=' . $document_entry['p_entity_id'] . '&cat_id=' .
$document_entry['p_cat_id']);
***************
*** 254,262 ****
);
- if($this->cat_id=='equipment')
- {
- $equipment_type_list =
$this->bocommon->select_category_equipment_list('filter',$this->equipment_type);
- }
-
if($this->entity_id)
{
--- 251,254 ----
***************
*** 273,279 ****
}
-
-
- //_debug_array($equipment_type_list);
$data = array
(
--- 265,268 ----
***************
*** 298,305 ****
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'lang_equipment_type_statustext'
=> lang('Select the equipment type the document belongs to. To do not use a
type select NO equipment type'),
- 'lang_no_equipment_type'
=> lang('No equipment type'),
- 'equipment_type_list'
=> $equipment_type_list,
-
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category. To do not use a category select NO CATEGORY'),
--- 287,290 ----
***************
*** 355,359 ****
$this->cat_id =
$this->bo->cat_id;
$this->status_id =
$this->bo->status_id;
- $this->equipment_type =
$this->bo->equipment_type;
}
//_debug_array($this->cat_id);
--- 340,343 ----
***************
*** 369,376 ****
$location_code =
get_var('location_code',array('POST','GET'));
- $equipment_id =
get_var('equipment_id',array('POST','GET'));
$p_num = get_var('p_num',array('POST','GET'));
!
$location=$this->bo->read_location_data($location_code,$equipment_id);
if($this->cat_id)
--- 353,359 ----
$location_code =
get_var('location_code',array('POST','GET'));
$p_num = get_var('p_num',array('POST','GET'));
! $location=$this->bo->read_location_data($location_code);
if($this->cat_id)
***************
*** 391,395 ****
'no_link' =>
False, // disable lookup links for location type less than type_id
'tenant' =>
False,
- 'equipment' =>
$equipment_id,
'lookup_type' => 'view',
'lookup_entity' =>
$lookup_entity,
--- 374,377 ----
***************
*** 402,416 ****
$links = $this->menu->links();
! $document_list =
$this->bo->read_at_location($location_code,$equipment_id);
//_debug_array($document_list);
! if(!$equipment_id)
{
! $directory = 'home/document' . SEP .
$location['loc1'];
}
else
{
! $directory = 'home/document' . SEP .
$location['loc1'] . SEP . $equipment_id;
}
--- 384,398 ----
$links = $this->menu->links();
! $document_list =
$this->bo->read_at_location($location_code);
//_debug_array($document_list);
! if($this->cat_id)
{
! $directory = 'home/document' . SEP .
$location['loc1'] . SEP . $category['name'] . SEP . $p_num;
}
else
{
! $directory = 'home/document' . SEP .
$location['loc1'];
}
***************
*** 444,448 ****
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.view&document_id='
. $document['document_id'] . '&from=list_doc'),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.edit&document_id='
. $document['document_id'] . '&from=list_doc'),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.delete&document_id='
. $document['document_id'] . '&location_code=' . $location_code .
'&equipment_id=' . $equipment_id),
'lang_view_file_statustext' =>
lang('view the document'),
'lang_view_statustext' =>
lang('view information about the document'),
--- 426,430 ----
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.view&document_id='
. $document['document_id'] . '&from=list_doc'),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.edit&document_id='
. $document['document_id'] . '&from=list_doc'),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.delete&document_id='
. $document['document_id'] . '&location_code=' . $location_code . '&p_num=' .
$p_num),
'lang_view_file_statustext' =>
lang('view the document'),
'lang_view_statustext' =>
lang('view information about the document'),
***************
*** 466,470 ****
'cat_id'
=>$this->cat_id,
'location_code'
=>$location_code,
-
'equipment_id'
=>$equipment_id,
'filter'
=>$this->filter,
'query'
=>$this->query)
--- 448,451 ----
***************
*** 483,487 ****
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add a
document'),
! 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.edit&location_code='
. $location_code . '&equipment_id=' . $equipment_id . '&from=list_doc')
);
--- 464,468 ----
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add a
document'),
! 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.edit&location_code='
. $location_code . '&p_entity_id=' . $this->entity_id . '&p_cat_id=' .
$this->cat_id . '&p_num=' . $p_num . '&from=list_doc&bypass=1')
);
***************
*** 491,498 ****
'sort'
=>$this->sort,
'order'
=>$this->order,
'cat_id'
=>$this->cat_id,
'location_code'
=>$location_code,
'filter'
=>$this->filter,
- 'equipment_id' =>$equipment_id,
'query'
=>$this->query
);
--- 472,479 ----
'sort'
=>$this->sort,
'order'
=>$this->order,
+ 'entity_id'
=>$this->entity_id,
'cat_id'
=>$this->cat_id,
'location_code'
=>$location_code,
'filter'
=>$this->filter,
'query'
=>$this->query
);
***************
*** 530,537 ****
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'lang_equipment_type_statustext'
=> lang('Select the equipment type the document belongs to. To do not use a
type select NO equipment type'),
- 'lang_no_equipment_type'
=> lang('No equipment type'),
- 'equipment_type_list'
=> $equipment_type_list,
-
'lang_status_statustext' =>
lang('Select the status the document belongs to. To do not use a category
select NO STATUS'),
'status_name'
=> 'status_id',
--- 511,514 ----
***************
*** 624,629 ****
$from =
get_var('from',array('POST','GET'));
$document_id =
get_var('document_id',array('POST','GET'));
! $location_code =
get_var('location_code',array('POST','GET'));
! $equipment_id =
get_var('equipment_id',array('POST','GET'));
$values =
get_var('values',array('POST'));
$insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
--- 601,605 ----
$from =
get_var('from',array('POST','GET'));
$document_id =
get_var('document_id',array('POST','GET'));
! // $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);
***************
*** 641,661 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('document'));
$receipt = $this->bo->create_home_dir();
//_debug_array($values);
!
! if(!$document_id && $location_code && !$values)
! {
! $values['location_data'] =
$this->bolocation->read_single($location_code,array('equipment_id'=>$equipment_id));
!
! }
!
!
! if ($values['save'])
{
-
- $values['document_date'] =
get_var('document_date',array('POST'));
- $values['vendor_id'] =
get_var('vendor_id',array('POST'));
-
for ($i=0;
$i<count($insert_record['location']); $i++)
{
--- 617,627 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('document'));
+ $bypass =
get_var('bypass',array('POST','GET'));
+
$receipt = $this->bo->create_home_dir();
//_debug_array($values);
! if($_POST && !$bypass)
{
for ($i=0;
$i<count($insert_record['location']); $i++)
{
***************
*** 678,681 ****
--- 644,679 ----
$values['location_name'] = $_POST['loc'
. (count($values['location'])).'_name']; // if not address - get the parent
name as address
+ }
+ else
+ {
+ $location_code =
get_var('location_code',array('POST','GET'));
+ $p_entity_id =
get_var('p_entity_id',array('POST','GET'));
+ $p_cat_id =
get_var('p_cat_id',array('POST','GET'));
+ $values['p'][$p_entity_id]['p_entity_id']
= $p_entity_id;
+ $values['p'][$p_entity_id]['p_cat_id']
= $p_cat_id;
+ $values['p'][$p_entity_id]['p_num']
= get_var('p_num',array('POST','GET'));
+ $values['p_entity_id']=$p_entity_id;
+ $values['p_cat_id']=$p_cat_id;
+
+ if($p_entity_id && $p_cat_id)
+ {
+ $boadmin_entity =
CreateObject($this->currentapp.'.boadmin_entity');
+ $entity_category =
$boadmin_entity->read_single_category($p_entity_id,$p_cat_id);
+
$values['p'][$p_entity_id]['p_cat_name'] = $entity_category['name'];
+ }
+
+ if($location_code)
+ {
+ $values['location_data'] =
$this->bolocation->read_single($location_code,array());
+ }
+
+ }
+
+ if ($values['save'])
+ {
+
+ $values['document_date'] =
get_var('document_date',array('POST'));
+ $values['vendor_id'] =
get_var('vendor_id',array('POST'));
+
if(!$values['link'])
{
***************
*** 791,797 ****
$location_code = $values['location_code'];
}
! if ($values['equipment_id'])
{
! $equipment_id = $values['equipment_id'];
}
--- 789,795 ----
$location_code = $values['location_code'];
}
! if ($values['p_num'])
{
! $p_num = $values['p_num'];
}
***************
*** 859,863 ****
'lang_save_statustext' =>
lang('Save the document'),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.'
.$from . '&location_code=' . $location_code . '&entity_id=' . $this->entity_id
. '&cat_id=' . $this->cat_id . '&preserve=1'),
'lang_done'
=> lang('done'),
'lang_done_statustext' =>
lang('Back to the list'),
--- 857,861 ----
'lang_save_statustext' =>
lang('Save the document'),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.'
.$from . '&location_code=' . $location_code . '&entity_id=' .
$values['p_entity_id'] . '&cat_id=' . $values['p_cat_id'] . '&preserve=1'),
'lang_done'
=> lang('done'),
'lang_done_statustext' =>
lang('Back to the list'),
***************
*** 931,935 ****
$location_code =
get_var('location_code',array('POST','GET'));
! $equipment_id =
get_var('equipment_id',array('POST','GET'));
$document_id =
get_var('document_id',array('POST','GET'));
$confirm = get_var('confirm',array('POST'));
--- 929,933 ----
$location_code =
get_var('location_code',array('POST','GET'));
! $p_num = get_var('p_num',array('POST','GET'));
$document_id =
get_var('document_id',array('POST','GET'));
$confirm = get_var('confirm',array('POST'));
***************
*** 939,943 ****
'menuaction' =>
$this->currentapp.'.uidocument.list_doc',
'location_code' => $location_code,
! 'equipment_id' => $equipment_id
);
--- 937,941 ----
'menuaction' =>
$this->currentapp.'.uidocument.list_doc',
'location_code' => $location_code,
! 'p_num' => $p_num
);
***************
*** 953,957 ****
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
! 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.delete&document_id='
. $document_id . '&location_code=' . $location_code . '&equipment_id=' .
$equipment_id),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
--- 951,955 ----
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
! 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.delete&document_id='
. $document_id . '&location_code=' . $location_code . '&p_num=' . $p_num),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
***************
*** 978,982 ****
$from =
get_var('from',array('POST','GET'));
$document_id =
get_var('document_id',array('POST','GET'));
- $values =
get_var('values',array('POST'));
if(!$from)
--- 976,979 ----
***************
*** 987,1013 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('document'));
- if($values)
- {
- $values = $values +
$this->bocommon->get_location();
- }
- else
- {
- $location_code =
get_var('location_code',array('POST','GET'));
- $values['equipment_id'] =
get_var('equipment_id',array('POST','GET'));
- $values['descr'] =
get_var('descr',array('POST','GET'));
-
- if($location_code)
- {
-
$location_data=$this->bocommon->read_location_data($location_code);
-
- $values=$values + $location_data;
- }
- }
-
- $values['document_date'] =
get_var('document_date',array('POST'));
- $values['vendor_id'] =
get_var('vendor_id',array('POST'));
-
- //_debug_array($values);
-
$values = $this->bo->read_single($document_id);
$function_msg = lang('view document');
--- 984,987 ----
***************
*** 1032,1036 ****
'no_link' =>
False, // disable lookup links for location type less than type_id
'tenant' =>
False,
- 'equipment' =>
$values['location_data']['equipment_id'],
'lookup_type' => 'view',
'lookup_entity' =>
$this->bocommon->get_lookup_entity('document'),
--- 1006,1009 ----
***************
*** 1082,1086 ****
'location_type'
=> 'form',
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.'
.$from . '&location_code=' . $values['location_code'] . '&equipment_id=' .
$values['equipment_id']),
'lang_year'
=> lang('Year'),
'lang_category'
=> lang('category'),
--- 1055,1059 ----
'location_type'
=> 'form',
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.'
.$from . '&location_code=' . $values['location_code'] . '&entity_id=' .
$values['p_entity_id'] . '&cat_id=' . $values['p_cat_id'] . '&preserve=1'),
'lang_year'
=> lang('Year'),
'lang_category'
=> lang('category'),
Index: class.bodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bodocument.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** class.bodocument.inc.php 23 Nov 2003 17:41:35 -0000 1.12
--- class.bodocument.inc.php 23 Nov 2003 19:22:09 -0000 1.13
***************
*** 317,332 ****
}
! function read_location_data($location_code,$equipment_id)
{
$location_data=
$this->solocation->read_single($location_code);
- if($equipment_id)
- {
- $location_data['equipment_id'] = $equipment_id;
- $location_data['equipment_type'] =
$this->bocommon->get_equipment_type($equipment_id);
- }
-
return $location_data;
-
}
--- 317,325 ----
}
! function read_location_data($location_code)
{
$location_data=
$this->solocation->read_single($location_code);
return $location_data;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.menu.inc.php, 1.4, 1.5 class.uidocument.inc.php, 1.21, 1.22 class.sodocument.inc.php, 1.16, 1.17 class.bodocument.inc.php, 1.12, 1.13,
Sigurd Nes <address@hidden> <=