extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get details filter working in et & et2

Browse Source
This commit is contained in:
Nathan Gray 2012-04-30 20:29:34 +00:00
parent afb14a532b
commit 7184574fab
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,6 +378,10 @@ class infolog_ui
{ {
$query['action_id'] = array_shift($query['action_id']); // display single parent as app_header $query['action_id'] = array_shift($query['action_id']); // display single parent as app_header
} }
// Check to see if we need to remove description
$et = new ReflectionClass('etemplate');
$remove = !($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']);
@ -388,7 +392,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') $query['filter2'] == 'no_describtion' && $remove)
{ {
unset($info['info_des']); unset($info['info_des']);
} }
@ -776,6 +780,16 @@ class infolog_ui
'all' => 'details', 'all' => 'details',
); );
if(!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['show_links']; if(!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['show_links'];
$values['nm']['filter2_onchange'] = "
if(typeof widget != 'undefined') {
// Show / hide descriptions
show_details(jQuery(this).val() == 'all');
}
else
{
this.form.submit();
}
";
// disable columns for main entry as set in the pref for details or no details // disable columns for main entry as set in the pref for details or no details
if ($action == 'sp') if ($action == 'sp')
{ {
@ -804,6 +818,10 @@ class infolog_ui
$values['nm']['header_left'] = 'infolog.index.dates'; $values['nm']['header_left'] = 'infolog.index.dates';
$GLOBALS['egw']->js->set_onload("set_style_by_class('table','custom_hide','visibility','visible');"); $GLOBALS['egw']->js->set_onload("set_style_by_class('table','custom_hide','visibility','visible');");
} }
if ($values['nm']['filter2'] == 'no_describtion')
{
$GLOBALS['egw']->js->set_onload("show_details(false);");
}
$values['nm']['bottom_too'] = True; $values['nm']['bottom_too'] = True;
$values['nm']['never_hide'] = isset($this->prefs['never_hide']) ? $values['nm']['never_hide'] = isset($this->prefs['never_hide']) ?
$this->prefs['never_hide'] : $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'] > 15; $this->prefs['never_hide'] : $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'] > 15;

9
infolog/js/index.js
View File

@ -29,3 +29,12 @@ function confirm_delete(_action, _senders)
} }
nm_open_popup(_action, _senders); nm_open_popup(_action, _senders);
} }
/**
* Show or hide details by changing the CSS class
*/
function show_details(show)
{
// Show / hide descriptions
egw.css(".et2_box.infoDes","display:" + (show ? "block;" : "none;"));
}