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

Fix missing select lookups

Browse Source
This commit is contained in:
Nathan Gray 2012-04-25 17:47:49 +00:00
parent 7f74846c93
commit b0ea2a5e63
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ class infolog_merge extends bo_merge
* @param string $prefix='' prefix like eg. 'erole' * @param string $prefix='' prefix like eg. 'erole'
* @return array|boolean * @return array|boolean
*/ */
public function infolog_replacements($id,$prefix='', &$content = '') public function infolog_replacements($id,$prefix='', &$content = '')
{ {
$record = new infolog_egw_record($id); $record = new infolog_egw_record($id);
$info = array(); $info = array();
@ -92,7 +92,7 @@ class infolog_merge extends bo_merge
foreach($_selects as $name => $value) foreach($_selects as $name => $value)
{ {
$selects['info_'.$name] = $value; $selects['info_'.$name] = $value;
$types['select'][] = 'info_'.$name; if(!in_array('info_'.$name, $types['select'])) $types['select'][] = 'info_'.$name;
} }
if($content && strpos($content, '$$#') !== 0) if($content && strpos($content, '$$#') !== 0)
@ -133,14 +133,14 @@ class infolog_merge extends bo_merge
$array["links/$app"] = $this->get_links('infolog',$id,$app, array($array['info_link']['id'])); $array["links/$app"] = $this->get_links('infolog',$id,$app, array($array['info_link']['id']));
} }
// Check for linked project ID // Check for linked project ID
$links = egw_link::get_links('infolog', $id, 'projectmanager'); $links = egw_link::get_links('infolog', $id, 'projectmanager');
foreach($links as $link_id => $app_id) { foreach($links as $link_id => $app_id) {
$array['pm_id'] = $app_id; $array['pm_id'] = $app_id;
$array['project'] = egw_link::title('projectmanager', $app_id); $array['project'] = egw_link::title('projectmanager', $app_id);
break; break;
} }
// Add markers // Add markers
foreach($array as $key => &$value) foreach($array as $key => &$value)
{ {