[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc/class.soentity.inc.php, 1.2.2.6
From: |
nomail |
Subject: |
[Phpgroupware-cvs] property/inc/class.soentity.inc.php, 1.2.2.6 |
Date: |
Mon, 27 Dec 2004 14:58:52 +0100 |
Update of /property/inc
Modified Files:
Branch: proposed-0_9_18-branch
class.soentity.inc.php
date: 2004/12/27 13:58:52; author: sigurdne; state: Exp; lines: +7 -7
Log Message:
no message
=====================================================================
Index: property/inc/class.soentity.inc.php
diff -u property/inc/class.soentity.inc.php:1.2.2.5
property/inc/class.soentity.inc.php:1.2.2.6
--- property/inc/class.soentity.inc.php:1.2.2.5 Tue Dec 7 09:04:28 2004
+++ property/inc/class.soentity.inc.php Mon Dec 27 13:58:52 2004
@@ -313,12 +313,13 @@
{
$contact_data =
$contacts->read_single_entry($value,array('n_given'=>'n_given','n_family'=>'n_family','email'=>'email'));
$entity_list[$j][$cols_return_extra[$i]['name']] =
$contact_data[0]['n_family'] . ', ' . $contact_data[0]['n_given'];
-
-/* $sql="SELECT org_name FROM
phpgw_addressbook where id=$value";
+ }
+
elseif($cols_return_extra[$i]['datatype']=='VENDOR' && $value):
+ {
+ $sql="SELECT org_name FROM
fm_vendor where id=$value";
$this->db2->query($sql);
$this->db2->next_record();
$entity_list[$j][$cols_return_extra[$i]['name']] = $this->db2->f('org_name');
-*/
}
elseif($cols_return_extra[$i]['datatype']=='CH' && $value):
{
@@ -559,7 +560,6 @@
function edit($values,$values_attribute,$entity_id,$cat_id)
{
-//_debug_array($values);
if($values['street_name'])
{
$address[]= $values['street_name'];
@@ -589,18 +589,18 @@
$value_set[$column] = $value;
}
-
if (isset($values_attribute) AND
is_array($values_attribute))
{
foreach($values_attribute as $entry)
{
- if($entry['datatype']!='AB')
+ if($entry['datatype']!='AB' &&
$entry['datatype']!='VENDOR')
{
$value_set[$entry['name']]
= $entry['value'];
}
}
}
+
$value_set =
$this->bocommon->validate_db_update($value_set);
$table='fm_entity_' . $entity_id .'_' . $cat_id;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc/class.soentity.inc.php, 1.2.2.6,
nomail <=