ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/zm_funcs.php
View File

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

2
web/zm_html_view_filter.php
View File

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

1
web/zm_lang_en_gb.php
View File

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