Modified contact grids to use display_name, and the contact model to take company name into account if no other fields will work for display name.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@762 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -41,14 +41,15 @@ class Contact extends AppModel {
|
||||
function saveContact($id, $data) {
|
||||
|
||||
// Establish a display name if not already given
|
||||
if (!$data['Contact']['display_name'])
|
||||
if (!$data['Contact']['display_name'] &&
|
||||
$data['Contact']['first_name'] && $data['Contact']['last_name'])
|
||||
$data['Contact']['display_name'] =
|
||||
(($data['Contact']['first_name'] &&
|
||||
$data['Contact']['last_name'])
|
||||
? $data['Contact']['last_name'] . ', ' . $data['Contact']['first_name']
|
||||
: ($data['Contact']['first_name']
|
||||
? $data['Contact']['first_name']
|
||||
: $data['Contact']['last_name']));
|
||||
$data['Contact']['last_name'] . ', ' . $data['Contact']['first_name'];
|
||||
|
||||
foreach (array('last_name', 'first_name', 'company_name') AS $fld) {
|
||||
if (!$data['Contact']['display_name'] && $data['Contact'][$fld])
|
||||
$data['Contact']['display_name'] = $data['Contact'][$fld];
|
||||
}
|
||||
|
||||
// Save the contact data
|
||||
$this->create();
|
||||
|
||||
Reference in New Issue
Block a user