Merge branch 'storageareas'

web/includes/actions/filter.php

@@ -102,6 +102,9 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
         if ( $filter->Background() )
           $filter->control('stop');
       } else {
+				if ( $action == 'SaveAs' ) {
+					$filter->Id(null);
+				}
         # COuld be execute
         if ( 0 ) {
         dbQuery('INSERT INTO Filters SET'.$sql);
@@ -109,6 +112,9 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
         $filter = new ZM\Filter($_REQUEST['Id']);
         }
         $filter->save($changes);
+
+				// We update the request id so that the newly saved filter is auto-selected
+				$_REQUEST['Id'] = $filter->Id();
       }
       if ( $filter->Background() )
         $filter->control('start');

web/skins/classic/views/js/event.js

@@ -202,7 +202,7 @@ function changeReplayMode() {
 
 var streamParms = "view=request&request=stream&connkey="+connKey;
 if ( auth_hash )
-	streamCmdParms += '&auth='+auth_hash;
+	streamParms += '&auth='+auth_hash;
 var streamCmdTimer = null;
 
 var streamStatus = null;

web/skins/classic/views/js/montagereview.js

@@ -1010,7 +1010,8 @@ function initPage() {
   $j('#maxTime').datetimepicker({
     timeFormat: "HH:mm:ss",
     dateFormat: "yy-mm-dd",
-    minDate: $j('#minTime').val(),
+    //minDate: $j('#minTime').val(),
+minDate: -7,
     maxDate: +0,
     constrainInput: false,
     onClose: function(newDate, oldData) {