extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 12:21:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix view parent / subs action for et2

Browse Source
This commit is contained in:
Nathan Gray 2012-06-18 18:52:05 +00:00
parent 5732ee7033
commit b80570cd66
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,7 +387,7 @@ class infolog_ui
// Check to see if we need to remove description // Check to see if we need to remove description
$et = new ReflectionClass('etemplate'); $et = new ReflectionClass('etemplate');
$remove = !($et->isSubclassOf(new ReflectionClass('etemplate_widget'))); $is_et2 = ($et->isSubclassOf(new ReflectionClass('etemplate_widget')));
foreach($infos as $id => $info) foreach($infos as $id => $info)
{ {
if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false) $info['info_addr'] = str_replace(',',', ',$info['info_addr']); if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false) $info['info_addr'] = str_replace(',',', ',$info['info_addr']);
@ -398,7 +398,7 @@ class infolog_ui
$info = $this->get_info($info,$readonlys,$query['action'],$query['action_id'],$query['filter2'],$details); $info = $this->get_info($info,$readonlys,$query['action'],$query['action_id'],$query['filter2'],$details);
if (!$query['filter2'] && $this->prefs['show_links'] == 'no_describtion' || if (!$query['filter2'] && $this->prefs['show_links'] == 'no_describtion' ||
$query['filter2'] == 'no_describtion' && $remove) $query['filter2'] == 'no_describtion' && !$is_et2)
{ {
unset($info['info_des']); unset($info['info_des']);
} }
@ -427,6 +427,8 @@ class infolog_ui
} }
array_splice($rows, $id, 0, array($main)); array_splice($rows, $id, 0, array($main));
unset($parents[$parent_index]); unset($parents[$parent_index]);
// et2 nextmatch listens to total, and only displays that many rows
if($is_et2) $query['total']++;
} }
$rows[] = $info; $rows[] = $info;
} }
@ -1271,7 +1273,8 @@ else
case 'view': case 'view':
// remember filter to restore it, if infolog icon get's clicked next time // remember filter to restore it, if infolog icon get's clicked next time
if ($query['filter']) egw_cache::setSession('infolog', 'filter_reset_from', $query['filter']); if ($query['filter']) egw_cache::setSession('infolog', 'filter_reset_from', $query['filter']);
return $this->index(array(),'sp',$checked,0); $this->index(array(),'sp',$checked,0);
common::egw_exit();
case 'ical': case 'ical':
// infolog_ical lets horde be auto-loaded, so it must go first // infolog_ical lets horde be auto-loaded, so it must go first
$boical = new infolog_ical(); $boical = new infolog_ical();