diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index 8f2946b5e..803916162 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -224,9 +224,23 @@ if ( ZM_OPT_X10 && canView( 'Devices' ) ) { ?>
  • >
  • =') $minTime = $term['val']; + if ($term['op'] == '<=') $maxTime = $term['val']; + } + } + if ($count == 2) { + $montageReviewQuery = '&minTime='.$minTime.'&maxTime='.$maxTime; + } +} if ( canView('Events') ) { ?> -
  • >
  • +
  • >
  • diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php index 720416045..221d0c181 100644 --- a/web/skins/classic/views/montagereview.php +++ b/web/skins/classic/views/montagereview.php @@ -59,17 +59,18 @@ include('_monitor_filters.php'); $filter_bar = ob_get_contents(); ob_end_clean(); -$filter = array( +if (isset($_REQUEST['minTime']) || isset($_REQUEST['maxTime'])) { + $filter = array( 'Query' => array( 'terms' => array( - array('attr' => 'StartDateTime', 'op' => '>=', 'val' => $_REQUEST[minTime]), - array('attr' => 'StartDateTime', 'op' => '<=', 'val' => $_REQUEST[maxTime]), + array('attr' => 'StartDateTime', 'op' => '>=', 'val' => $_REQUEST['minTime']), + array('attr' => 'StartDateTime', 'op' => '<=', 'val' => $_REQUEST['maxTime']), ) ), ); - -parseFilter( $filter ); -$filterQuery = $filter['query']; + parseFilter( $filter ); + $filterQuery = $filter['query']; +} // Note that this finds incomplete events as well, and any frame records written, but still cannot "see" to the end frame // if the bulk record has not been written - to be able to include more current frames reduce bulk frame sizes (event size can be large)