From 82e8bde40626b9b91fe35d583993080169ab4b17 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 26 Aug 2019 16:19:19 -0400 Subject: [PATCH 1/3] Fix SaveAs --- web/includes/actions/filter.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/includes/actions/filter.php b/web/includes/actions/filter.php index 2e1f282c7..34bd49422 100644 --- a/web/includes/actions/filter.php +++ b/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'); From 7768d39eb94437b8450a281ff0308ff689232f48 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 26 Aug 2019 16:19:44 -0400 Subject: [PATCH 2/3] Add auth to streamParms so that multi-server event viewing works --- web/skins/classic/views/js/event.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index 94d47f20b..d762b53d9 100644 --- a/web/skins/classic/views/js/event.js +++ b/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; From 292b530f995c103657d83a6a59d1557f245d1bc4 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 26 Aug 2019 16:20:23 -0400 Subject: [PATCH 3/3] Allow montage review maxdatetime to be less than minDateTime. This allows us to set it first so that the reload does kill us --- web/skins/classic/views/js/montagereview.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/montagereview.js b/web/skins/classic/views/js/montagereview.js index 06f23170f..bc06deeba 100644 --- a/web/skins/classic/views/js/montagereview.js +++ b/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) {