[checkmk-commits] #2722 FIX Fixed some icon links from views opening in dashlet frames instead of the whole page

Module: check_mk Branch: master Commit: ab0c461aab224d7ff0e5c946fa3aa8bc1136ef7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab0c461aab224d… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Nov 2 16:26:47 2015 +0100 #2722 FIX Fixed some icon links from views opening in dashlet frames instead of the whole page e.g. the "crashed checks" icon was providing a link which opened the crashed check page inside a dashlet when clicked on the icon within a dashlet view. --- .werks/2722 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/2722 b/.werks/2722 new file mode 100644 index 0000000..22153da --- /dev/null +++ b/.werks/2722 @@ -0,0 +1,10 @@ +Title: Fixed some icon links from views opening in dashlet frames instead of the whole page +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1446477951 +Class: fix + +e.g. the "crashed checks" icon was providing a link which opened the crashed check page +inside a dashlet when clicked on the icon within a dashlet view. diff --git a/ChangeLog b/ChangeLog index f6bdea3..6349a05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * 2691 FIX: Fixed exception in host address painter when displaying hosts/services of older sites * 2670 FIX: Fix problem that no site is configured when user has deleted only site... * 2717 FIX: Fixed broken webserver level authentication integration (e.g. basic, kerberos)... + * 2722 FIX: Fixed some icon links from views opening in dashlet frames instead of the whole page... WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e571785..4533379 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2557,7 +2557,7 @@ def ajax_popup_action_menu(): url = 'javascript:void(0)' target = "" - if target_frame != "_self": + if target_frame and target_frame != "_self": target = " target=\"%s\"" % target_frame html.write('<a href="%s"%s%s>' % (url, target, onclick)) @@ -2581,4 +2581,4 @@ def sanitize_action_url(url_spec): if type(url_spec) == tuple: return url_spec else: - return (url_spec, "_self") + return (url_spec, None)