✨ JS - manage reload on modal close with tab activation

1 files changed, 14 insertions, 5 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 624d1902b..3835d8677 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -528,7 +528,6 @@ $(document).ready(function(){
     register_wait_button();
     $(".help-text-parent").click(function(){
         if ($(this).is(":visible")) {
-            console.log($(this).attr("id"));
             $("[aria-controls='" + $(this).attr("id") + "']").click();
         }
     });
@@ -545,9 +544,14 @@ var register_modal_on_close = function(){
                 modal_on_close[this.id] = undefined;
                 $("#" + this.id).on('hide.bs.modal', function() {
                     if (modal_on_close[this.id] !== undefined){
-                        modal_on_close[this.id]();
+                        parameters = {}
+                        if (modal_on_close[this.id + "-window-id"]) parameters["window-id"] = modal_on_close[this.id + "-window-id"];
+                        if (modal_on_close[this.id + "-window-tab"]) parameters["window-tab"] = modal_on_close[this.id + "-window-tab"];
+                        modal_on_close[this.id](parameters);
                         // reinitialize after call
                         modal_on_close[this.id] = undefined;
+                        modal_on_close[this.id + "-window-id"] = undefined;
+                        modal_on_close[this.id + "-window-tab"] = undefined;
                     }
                 });
             }
@@ -1044,7 +1048,8 @@ function toggle_window_menu(){
 var register_qa = function(){
     $(".btn-qa").click(function(){
         let target = $(this).attr('data-target');
-        dt_qa_open(target);
+        let window_id = $(this).attr('data-window');
+        dt_qa_open(target, null, window_id);
     });
 };
 
@@ -1053,7 +1058,8 @@ var register_qa_confirm = function(){
         let confirm_message = $(this).attr('data-confirm');
         let target = $(this).attr('data-target');
         if (!confirm(confirm_message)) return;
-        dt_qa_open(target);
+        let window_id = $(this).attr('data-window');
+        dt_qa_open(target, null, window_id);
     });
 };
 
@@ -1258,7 +1264,7 @@ var dt_generate_qa_url = function (table, url){
     return url;
 };
 
-var dt_qa_open = function (url, modal_id){
+var dt_qa_open = function (url, modal_id, window_id){
     if (!modal_id) modal_id = "modal-dynamic-form";
     if (!$('#' + modal_id).length){
         let src = '<div class="modal" id="' + modal_id +  '" tabindex="-1" role="dialog"';
@@ -1266,6 +1272,8 @@ var dt_qa_open = function (url, modal_id){
         $("#message").after(src);
     }
     short_wait();
+    let data = {};
+    if (window_id) data["window_id"] = window_id;
     $.ajax({
         url: url,
         cache: false,
@@ -1283,6 +1291,7 @@ var dt_qa_open = function (url, modal_id){
             let table_scroll_height = $(window).height() - 180;
             $(".table-scroll table").height(table_scroll_height + "px");
         },
+        data: data,
         error: function() {
             close_wait();
         }