mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-05-08 22:53:42 -04:00
Merge pull request #4758 from IgorA100/patch-718309
When using ONVIF, the console page should not display simply "Use ONVIF Events", but should also indicate which event the trigger is configured for.
This commit is contained in:
@@ -390,7 +390,7 @@ function queryRequest() {
|
||||
}
|
||||
$row['Analysing'] = isset($monitor['Analysing']) ? $monitor['Analysing'] : 'None';
|
||||
$row['Recording'] = isset($monitor['Recording']) ? $monitor['Recording'] : 'None';
|
||||
$row['ONVIF_Event_Listener'] = isset($monitor['ONVIF_Event_Listener']) ? $monitor['ONVIF_Event_Listener'] : 0;
|
||||
$row['ONVIF_Event_Listener'] = isset($monitor['ONVIF_Event_Listener']) ? $monitor['ONVIF_Alarm_Text'] : 0;
|
||||
$row['UpdatedOn'] = isset($monitor['UpdatedOn']) ? $monitor['UpdatedOn'] : '';
|
||||
$row['Type'] = $monitor['Type'];
|
||||
$row['Capturing'] = isset($monitor['Capturing']) ? $monitor['Capturing'] : 'None';
|
||||
|
||||
@@ -240,7 +240,7 @@ function processRows(rows) {
|
||||
functionHtml += 'Analysing: ' + row.Analysing + '<br/>';
|
||||
}
|
||||
if (row.ONVIF_Event_Listener) {
|
||||
functionHtml += ' Use ONVIF Events<br/>';
|
||||
functionHtml += ' Use ONVIF \'' + row.ONVIF_Event_Listener + '\'<br/>';
|
||||
}
|
||||
if (row.Recording && row.Recording != 'None') {
|
||||
functionHtml += 'Recording: ' + row.Recording + '<br/>';
|
||||
|
||||
Reference in New Issue
Block a user