holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add in contact placeholders for custom fields of type select-account

Browse Source
This commit is contained in:
Nathan Gray 2013-06-04 21:24:17 +00:00
parent 86d54d092c
commit b50dc80ee1
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
infolog/inc/class.infolog_merge.inc.php
View File

@ -101,6 +101,17 @@ class infolog_merge extends bo_merge
$this->cf_link_to_expand($record->get_record_array(), $content, $info); $this->cf_link_to_expand($record->get_record_array(), $content, $info);
} }
foreach($this->bo->customfields as $name => $field)
{
if ($field['type'] == 'select-account')
{
$record_name = '#'.$name;
$info += $this->contact_replacements(
array('account_id' => $record->$record_name),
($prefix ? $prefix . '/' : '')."#$name"
);
}
}
importexport_export_csv::convert($record, $types, 'infolog', $selects); importexport_export_csv::convert($record, $types, 'infolog', $selects);
if($record->info_contact) if($record->info_contact)
{ {
@ -121,7 +132,10 @@ class infolog_merge extends bo_merge
$array = $record->get_record_array(); $array = $record->get_record_array();
foreach($this->bo->customfields as $name => $field) foreach($this->bo->customfields as $name => $field)
{ {
if(!$array['#'.$name]) $array['#'.$name] = ''; if(!$array['#'.$name])
{
$array['#'.$name] = '';
}
} }
// Links // Links
@ -177,9 +191,15 @@ class infolog_merge extends bo_merge
} }
echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>"; echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
$contact_custom = false;
foreach($this->bo->customfields as $name => $field) foreach($this->bo->customfields as $name => $field)
{ {
echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n"; echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label'].($field['type'] == 'select-account' ? '*':'')."</td></tr>\n";
if($field['type'] == 'select-account') $contact_custom = true;
}
if($contact_custom)
{
echo '<tr><td /><td colspan="3">* '.lang('Addressbook placeholders available'). '</td></tr>';
} }
echo '<tr><td colspan="4"><h3>'.lang('Contact fields').':</h3></td></tr>'; echo '<tr><td colspan="4"><h3>'.lang('Contact fields').':</h3></td></tr>';