Merge branch 'devops24_51117' into 'master'

Finish task#51117

See merge request easycorp/zentaopms!2629

module/bug/js/view.js

@@ -0,0 +1,4 @@
+$(document).ready(function()
+{
+    limitIframeLevel();
+});

module/task/js/view.js

@@ -5,3 +5,7 @@ function assign(taskID, assignedTo)
   $('.assign').load(createLink('user', 'ajaxGetUser', 'taskID=' + taskID + '&assignedTo=' + assignedTo));
 }
 
+$(document).ready(function()
+{
+    limitIframeLevel();
+});

module/testcase/js/view.js

@@ -1,4 +1,4 @@
-$(document).ready(function() 
+$(document).ready(function()
 {
     if(config.onlybody != 'yes')$(".runCase").modalTrigger({width:'90%', type:'iframe', afterHide:function(){parent.location.href=parent.location.href;}});
     if(config.onlybody != 'yes')$(".results").modalTrigger({width:'90%', type:'iframe'});
@@ -21,4 +21,6 @@ $(document).ready(function()
 
         setTimeout($.resetToolbarPosition, 50);
     });
+
+    limitIframeLevel();
 })

www/js/my.full.js

@@ -848,6 +848,24 @@ function scrollToSelected(id)
     }
 }
 
+/**
+ * Limit iframe levels up to 3.
+ *
+ * @access public
+ * @return void
+ */
+function limitIframeLevel()
+{
+    /* Fix bug #15325. */
+    if(window.parent != window.top)
+    {
+        $('body').find('a.iframe').each(function()
+        {
+            $(this).replaceWith($(this).clone().removeClass('iframe'));
+        });
+    }
+}
+
 /* Ping the server every some minutes to keep the session. */
 needPing = true;