Merge branch 'version_1231' into testing

guilhemmarchand · Jan 14, 2021 · 46d3e6f · 46d3e6f
2 parents 018ebe9 + 3e50f5f
commit 46d3e6f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
@@ -18,6 +18,7 @@ https://trackme.readthedocs.io/en/latest/configuration.html
 - Feature: REST API endpoint for Data Sampling - allow rest and run sampling
 - Fix - Issue #217 - Activity alerts view results link would result to 404 page not found for out of the box alerts
 - Fix - Issue #218 - Data sampling - creating custom rule from main then clicking on back leads to wrong window
+- Fix - Issue #219 - Outliers detection - dropdown for alert on upper is not pref-filled with the actual setting of the entity
 - Change: Icons change
 
 Version 1.2.30

diff --git a/trackme/default/data/ui/html/TrackMe.html b/trackme/default/data/ui/html/TrackMe.html
@@ -16771,10 +16771,8 @@ <h2 class="panel-title">Search for audit changes:</h2>
 
                 // prefill the current status
                 //console.log("tk_outlieralertonupper is: " + tk_outlieralertonupper);
-                if (tk_outlieralertonupper && tk_outlieralertonupper == "true") {
-                    setToken("form.tk_input_data_host_outlier_alert_on_upper", TokenUtils.replaceTokenNames("true", _.extend(submittedTokenModel.toJSON(), e.data)));
-                } else {
-                    setToken("form.tk_input_data_host_outlier_alert_on_upper", TokenUtils.replaceTokenNames("false", _.extend(submittedTokenModel.toJSON(), e.data)));
+                if (tk_outlieralertonupper && tk_outlieralertonupper != "null") {
+                    setToken("form.tk_input_data_source_outlier_alert_on_upper", TokenUtils.replaceTokenNames(tk_outlieralertonupper, _.extend(submittedTokenModel.toJSON(), e.data)));
                 }
 
                 // prefill the outlier span
@@ -17675,6 +17673,12 @@ <h2 class="panel-title">Search for audit changes:</h2>
                     setToken("form.tk_input_data_host_outlier_min_eventcount", TokenUtils.replaceTokenNames("disabled", _.extend(submittedTokenModel.toJSON(), e.data)));
                 }
 
+                // prefill the current status
+                // console.log("tk_outlieralertonupper is: " + tk_outlieralertonupper);
+                if (tk_outlieralertonupper && tk_outlieralertonupper != "null") {
+                    setToken("form.tk_input_data_host_outlier_alert_on_upper", TokenUtils.replaceTokenNames(tk_outlieralertonupper, _.extend(submittedTokenModel.toJSON(), e.data)));
+                }
+
                 // prefill the outlier span
                 //console.log("tk_outlier_span is: " + tk_outlier_span);
                 if (tk_outlier_span && tk_outlier_span != "null") {

diff --git a/trackme_1231.tgz b/trackme_1231.tgz