[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.42.2.5.
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.42.2.5.2.27, 1.42.2.5.2.28 class.uiprojects.inc.php, 1.47.2.7.2.31, 1.47.2.7.2.32 |
|
Date: |
Wed, 10 Sep 2003 22:45:54 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv5079/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boprojects.inc.php class.uiprojects.inc.php
Log Message:
update
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.27
retrieving revision 1.42.2.5.2.28
diff -C2 -r1.42.2.5.2.27 -r1.42.2.5.2.28
*** class.boprojects.inc.php 29 Aug 2003 00:01:52 -0000 1.42.2.5.2.27
--- class.boprojects.inc.php 11 Sep 2003 02:45:51 -0000 1.42.2.5.2.28
***************
*** 164,171 ****
$this->accounts->read_repository();
!
$cached_data[$this->accounts->data['account_id']]['account_id'] =
$this->accounts->data['account_id'];
!
$cached_data[$this->accounts->data['account_id']]['account_lid'] =
$this->accounts->data['account_lid'];
!
$cached_data[$this->accounts->data['account_id']]['firstname'] =
$this->accounts->data['firstname'];
!
$cached_data[$this->accounts->data['account_id']]['lastname'] =
$this->accounts->data['lastname'];
return $cached_data;
--- 164,171 ----
$this->accounts->read_repository();
!
$cached_data[$this->accounts->data['account_id']]['account_id']
= $this->accounts->data['account_id'];
!
$cached_data[$this->accounts->data['account_id']]['account_lid']
= $this->accounts->data['account_lid'];
!
$cached_data[$this->accounts->data['account_id']]['account_firstname'] =
$this->accounts->data['account_firstname'];
!
$cached_data[$this->accounts->data['account_id']]['account_lastname'] =
$this->accounts->data['account_lastname'];
return $cached_data;
***************
*** 191,199 ****
$account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
! $cols = array('n_given' => 'n_given',
! 'n_family' => 'n_family',
! 'org_name' => 'org_name');
! $entries =
$this->contacts->read($start,$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
$cols, $query, $qfilter, $sort, $order, $account_id);
$this->total_records = $this->contacts->total_records;
return $entries;
--- 191,198 ----
$account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
! $cols =
array('per_first_name','per_last_name','org_name','contact_id');
! $entries = $this->contacts->get_persons($cols,
$limit='',$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
$order, $sort, $criteria='');
! //$entries =
$this->contacts->read($start,$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
$cols, $query, $qfilter, $sort, $order, $account_id);
$this->total_records = $this->contacts->total_records;
return $entries;
***************
*** 202,210 ****
function read_single_contact($abid)
{
! $cols = array('n_given' => 'n_given',
! 'n_family' => 'n_family',
! 'org_name' => 'org_name');
!
! return $this->contacts->read_single_entry($abid,$cols);
}
--- 201,207 ----
function read_single_contact($abid)
{
! $cols =
array('per_first_name','per_last_name','org_name','contact_id');
! return $this->contacts->get_persons($cols,
$limit='',$maxmatchs='', $order='',
$sort='',$criteria=array('contact_id'=>$abid));
! //return
$this->contacts->read_single_entry($abid,$cols);
}
***************
*** 345,350 ****
'account_id' =>
$this->accounts->data['account_id'],
'account_lid' =>
$this->accounts->data['account_lid'],
! 'account_firstname' =>
$this->accounts->data['firstname'],
! 'account_lastname' =>
$this->accounts->data['lastname']
);
}
--- 342,347 ----
'account_id' =>
$this->accounts->data['account_id'],
'account_lid' =>
$this->accounts->data['account_lid'],
! 'account_firstname' =>
$this->accounts->data['account_firstname'],
! 'account_lastname' =>
$this->accounts->data['account_lastname']
);
}
***************
*** 451,456 ****
$cached_data =
$this->cached_accounts($pro['coordinator']);
$coordinatorout =
$GLOBALS['phpgw']->strip_html($cached_data[$pro['coordinator']]['account_lid']
! . ' [' .
$cached_data[$pro['coordinator']]['firstname'] . ' '
! .
$cached_data[$pro['coordinator']]['lastname'] . ' ]');
/*if ($pro['customer'])
{
--- 448,453 ----
$cached_data =
$this->cached_accounts($pro['coordinator']);
$coordinatorout =
$GLOBALS['phpgw']->strip_html($cached_data[$pro['coordinator']]['account_lid']
! . ' [' .
$cached_data[$pro['coordinator']]['account_firstname'] . ' '
! .
$cached_data[$pro['coordinator']]['account_lastname'] . ' ]');
/*if ($pro['customer'])
{
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.31
retrieving revision 1.47.2.7.2.32
diff -C2 -r1.47.2.7.2.31 -r1.47.2.7.2.32
*** class.uiprojects.inc.php 10 Sep 2003 22:15:54 -0000 1.47.2.7.2.31
--- class.uiprojects.inc.php 11 Sep 2003 02:45:51 -0000 1.47.2.7.2.32
***************
*** 776,780 ****
$co =
$GLOBALS['phpgw']->accounts->get_account_data($values['coordinator']);
$GLOBALS['phpgw']->template->set_var('accountname',$GLOBALS['phpgw']->common->display_fullname($co[$values['coordinator']]['lid'],
!
$co[$values['coordinator']]['firstname'],$co[$values['coordinator']]['lastname']));
}
$GLOBALS['phpgw']->template->set_var('clisthandle','');
--- 776,780 ----
$co =
$GLOBALS['phpgw']->accounts->get_account_data($values['coordinator']);
$GLOBALS['phpgw']->template->set_var('accountname',$GLOBALS['phpgw']->common->display_fullname($co[$values['coordinator']]['lid'],
!
$co[$values['coordinator']]['account_firstname'],$co[$values['coordinator']]['account_lastname']));
}
$GLOBALS['phpgw']->template->set_var('clisthandle','');
***************
*** 1472,1478 ****
{
$GLOBALS['phpgw']->template->set_var('tr_color',$this->nextmatchs->alternate_row_color($tr_color));
! $firstname = $entries[$i]['n_given'];
if (!$firstname) { $firstname = ' '; }
! $lastname = $entries[$i]['n_family'];
if (!$lastname) { $lastname = ' '; }
$company = $entries[$i]['org_name'];
--- 1472,1478 ----
{
$GLOBALS['phpgw']->template->set_var('tr_color',$this->nextmatchs->alternate_row_color($tr_color));
! $firstname = $entries[$i]['per_first_name'];
if (!$firstname) { $firstname = ' '; }
! $lastname = $entries[$i]['per_last_name'];
if (!$lastname) { $lastname = ' '; }
$company = $entries[$i]['org_name'];
***************
*** 1484,1488 ****
'firstname' => $firstname,
'lastname' => $lastname,
! 'abid'
=> $entries[$i]['id']));
$GLOBALS['phpgw']->template->parse('list','abook_list',True);
--- 1484,1488 ----
'firstname' => $firstname,
'lastname' => $lastname,
! 'abid'
=> $entries[$i]['contact_id']));
$GLOBALS['phpgw']->template->parse('list','abook_list',True);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.42.2.5.2.27, 1.42.2.5.2.28 class.uiprojects.inc.php, 1.47.2.7.2.31, 1.47.2.7.2.32,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: addressbook/templates/default preferences.tpl, 1.5.6.1, 1.5.6.2
- Next by Date:
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.52, 1.53 class.soprojects.inc.php, 1.43, 1.44 class.uiprojects.inc.php, 1.65, 1.66
- Previous by thread:
[Phpgroupware-cvs] CVS: addressbook/templates/default preferences.tpl, 1.5.6.1, 1.5.6.2
- Next by thread:
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.52, 1.53 class.soprojects.inc.php, 1.43, 1.44 class.uiprojects.inc.php, 1.65, 1.66
- Index(es):