show embedded action/notes url with original link

and open embedded by javascript
sni · Sep 18, 2023 · a245fc4 · a245fc4
1 parent 71350bc
commit a245fc4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/Thruk/Utils/Filter.pm b/lib/Thruk/Utils/Filter.pm
@@ -1670,8 +1670,7 @@ sub set_target_link {
 
     if(!$target || $target eq 'main') {
         if(_is_frame_url_allowed($href)) {
-            $target = '';
-            $href   = $prefix.'#'.$href;
+            $target = 'embedded';
             push @{$c->stash->{'allowed_frame_links'}}, $href;
         } else {
             $target = '_blank';

diff --git a/root/thruk/javascript/thruk-3.08.3.js b/root/thruk/javascript/thruk-3.08.3.js
@@ -205,6 +205,21 @@ function init_page() {
         thrukState.unloading = true;
     });
 
+    // open embedded action/notes urls in same page (as embedded iframe)
+    jQuery("A[target=embedded]").off("click").on("click", function(e) {
+        var link = e.target;
+        if(link.tagName != "A") {
+            var links = jQuery(link).parents("A");
+            if(links && links[0]) {
+                link = links[0];
+            }
+        }
+        if(link && link.href) {
+            e.preventDefault();
+            redirect_url(url_prefix+"#"+link.href);
+        }
+    });
+
     // break from old frame mode
     try {
         if(window.frameElement && window.frameElement.tagName == "FRAME" && window.top && window.top.location != location) {