ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

StartTimeShort should be StartDateTimeShort. Leave StartTimeShort for backwards compatibility. Add Storage, DiskSpace in status=>event

This commit is contained in:
Isaac Connor 2021-06-08 15:54:14 -04:00
parent 16295598dc
commit 131e57a99e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/ajax/status.php
View File

@ -108,7 +108,9 @@ $statusData = array(
'Cause' => true, 'Cause' => true,
'Notes' => true, 'Notes' => true,
'StartDateTime' => true, 'StartDateTime' => true,
# Left for backwards compatability. Remove in 1.37
'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ),
'StartDateTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ),
'EndDateTime' => true, 'EndDateTime' => true,
'Width' => true, 'Width' => true,
'Height' => true, 'Height' => true,
@ -131,8 +133,12 @@ $statusData = array(
'MonitorName' => array('sql' => '(SELECT Monitors.Name FROM Monitors WHERE Monitors.Id = Events.MonitorId)'), 'MonitorName' => array('sql' => '(SELECT Monitors.Name FROM Monitors WHERE Monitors.Id = Events.MonitorId)'),
'Name' => true, 'Name' => true,
'Cause' => true, 'Cause' => true,
'DiskSpace' => true,
'Storage' => array('sql' => '(SELECT Storage.Name FROM Storage WHERE Storage.Id=Events.StorageId)'),
'StartDateTime' => true, 'StartDateTime' => true,
# Left for backwards compatability. Remove in 1.37
'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ),
'StartDateTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ),
'EndDateTime' => true, 'EndDateTime' => true,
'Width' => true, 'Width' => true,
'Height' => true, 'Height' => true,