extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add placeholders for parent

Browse Source
This commit is contained in:
Nathan Gray 2014-06-18 15:50:23 +00:00
parent 3f8ac20b7a
commit 228d3e9614
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,6 +144,12 @@ class infolog_merge extends bo_merge
if(!$value) $value = ''; if(!$value) $value = '';
$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value; $info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
} }
// Add parent
if($record->info_id_parent)
{
$info += $this->infolog_replacements($record->info_id_parent, 'info_id_parent', $content);
}
return $info; return $info;
} }
@ -191,6 +197,9 @@ class infolog_merge extends bo_merge
echo '<tr><td /><td colspan="3">* '.lang('Addressbook placeholders available'). '</td></tr>'; echo '<tr><td /><td colspan="3">* '.lang('Addressbook placeholders available'). '</td></tr>';
} }
echo '<tr><td colspan="4"><h3>'.lang('Parent').":</h3></td></tr>";
echo '<tr><td>{{info_id_parent/info_subject}}</td><td colspan="3">'.lang('All other %1 fields are valid',lang('infolog'))."</td></tr>\n";
echo '<tr><td colspan="4"><h3>'.lang('Contact fields').':</h3></td></tr>'; echo '<tr><td colspan="4"><h3>'.lang('Contact fields').':</h3></td></tr>';
$n = 0; $n = 0;
foreach($this->contacts->contact_fields as $name => $label) foreach($this->contacts->contact_fields as $name => $label)