Bug 203 - Added filtering on Notes field.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1601 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
stan 2005-11-20 12:16:42 +00:00
parent 8a04a85321
commit 914afba668
3 changed files with 6 additions and 6 deletions

View File

@ -885,12 +885,6 @@ function parseFilter( $save_to_session=false, $term_sep='&' )
case 'MonitorName':
$filter_sql .= 'M.'.preg_replace( '/^Monitor/', '', $$attr_name );
break;
case 'Name':
$filter_sql .= "E.Name";
break;
case 'Cause':
$filter_sql .= "E.Cause";
break;
case 'DateTime':
$filter_sql .= "E.StartTime";
break;
@ -912,6 +906,8 @@ function parseFilter( $save_to_session=false, $term_sep='&' )
case 'TotScore':
case 'AvgScore':
case 'MaxScore':
case 'Cause':
case 'Notes':
case 'Archived':
$filter_sql .= "E.".$$attr_name;
break;
@ -930,6 +926,7 @@ function parseFilter( $save_to_session=false, $term_sep='&' )
case 'MonitorName':
case 'Name':
case 'Cause':
case 'Notes':
$value = "'$value'";
break;
case 'DateTime':

View File

@ -65,6 +65,7 @@ $attr_types = array(
'MonitorName' => $zmSlangAttrMonitorName,
'Name' => $zmSlangAttrName,
'Cause' => $zmSlangAttrCause,
'Notes' => $zmSlangAttrNotes,
'DateTime' => $zmSlangAttrDateTime,
'Date' => $zmSlangAttrDate,
'Time' => $zmSlangAttrTime,
@ -99,6 +100,7 @@ $sort_fields = array(
'Id' => $zmSlangAttrId,
'Name' => $zmSlangAttrName,
'Cause' => $zmSlangAttrCause,
'Notes' => $zmSlangAttrNotes,
'MonitorName' => $zmSlangAttrMonitorName,
'DateTime' => $zmSlangAttrDateTime,
'Length' => $zmSlangAttrDuration,

View File

@ -107,6 +107,7 @@ $zmSlangAttrMaxScore = 'Max. Score';
$zmSlangAttrMonitorId = 'Monitor Id';
$zmSlangAttrMonitorName = 'Monitor Name';
$zmSlangAttrName = 'Name';
$zmSlangAttrNotes = 'Notes';
$zmSlangAttrTime = 'Time';
$zmSlangAttrTotalScore = 'Total Score';
$zmSlangAttrWeekday = 'Weekday';