extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 02:02:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move handling of filter by date from user interface into logic layer

Browse Source
This commit is contained in:
Nathan Gray 2011-11-24 17:56:05 +00:00
parent b023204b1d
commit e5cbfc5601
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infolog/inc/class.infolog_bo.inc.php
View File

@ -1006,6 +1006,12 @@ class infolog_bo
function &search(&$query)
{
//error_log(__METHOD__.'('.array2string($query).')');
if($query['filter'] == 'bydate')
{
if (is_int($query['startdate'])) $query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
}
if (!isset($query['date_format']) || $query['date_format'] != 'server')
{
if (isset($query['col_filter']))

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

@ -275,8 +275,6 @@ class infolog_ui
{
$query['header_left'] = 'infolog.index.dates';
$GLOBALS['egw']->js->set_onload("set_style_by_class('table','custom_hide','visibility','visible');");
if (is_int($query['startdate'])) $query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
}
else
{