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

Bug 422 - Fixed issue with navigating view when no filter. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2261 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
stan 2007-12-21 11:58:04 +00:00
parent 45cb0c2d22
commit 66b7d3ec73
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/zm_html_view_timeline.php
View File

@ -256,15 +256,18 @@ else
}
//echo "MnT: $temp_min_time, MxT: $temp_max_time, ExP: $temp_expandable<br>";
appendDatetimeRange( $tree, $min_time, $max_time );
$filter_query = parseTreeToQuery( $tree );
if ( $filter_query )
if ( $tree )
{
$filter_query = '&'.$filter_query;
appendDatetimeRange( $tree, $min_time, $max_time );
$filter_query = parseTreeToQuery( $tree );
if ( $filter_query )
{
$filter_query = '&'.$filter_query;
}
//echo $filter_query;
//echo '<br>';
}
//echo $filter_query;
//echo '<br>';
$scales = array(
array( "name"=>"year", "factor"=>60*60*24*365, "align"=>1, "zoomout"=>2, "label"=>STRF_TL_AXIS_LABEL_YEAR ),