Merge branch 'version_1231' into testing

docs/releasenotes.rst

@@ -17,6 +17,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
 - Change: Icons change
 
 Version 1.2.30

trackme/default/data/ui/html/TrackMe.html

@@ -35347,7 +35347,10 @@ <h2 class="panel-title">Search for audit changes:</h2>
 
             // free searches
             setToken("show_data_sampling_custom_rules", "true");
-
+
+            // define a token that will be used to determine where in the UI we came from
+            setToken("show_data_sampling_custom_rules_from_home", "true");
+
             // force re-run the search each time the button is clicked
             searchDataSamplingShowCustomRules.startSearch();
 
@@ -36475,7 +36478,16 @@ <h2 class="panel-title">Search for audit changes:</h2>
                                     comment = tk_comment;
                                     auditRecord(action, change_type, object, object_category, object_attrs, result, comment);
 
-                                    $("#data_sampling_manage").modal();
+                                    // Take a decision depending on where we come from
+                                    var tk_data_sampling_custom_rule_name = tokens.get("show_data_sampling_custom_rules_from_home");
+
+                                    if ( tk_data_sampling_custom_rule_name == "true") {
+                                        $("#data_sampling_show_custom_rules").modal();
+                                    }
+                                    else {
+                                        $("#data_sampling_manage").modal();
+                                    }
+
                                 },
                                 failed: function(properties) {
                                     let errorStr = "Unknown Error!";