[checkmk-commits] Made code for rendering the popup menu more flexible

Module: check_mk Branch: master Commit: d8b5ffdd859ba136c15ef99ffb1bb5e495394d26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8b5ffdd859ba1… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Feb 1 12:39:22 2016 +0100 Made code for rendering the popup menu more flexible --- web/htdocs/pagetypes.py | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index a951588..20d1907 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -973,14 +973,28 @@ class Container: # The popup for "Add to ...", e.g. for adding a graph to a report # or dashboard. This is needed for page types with the aspect "ElementContainer". @classmethod - def render_addto_popup(self): + def render_addto_popup(self, added_type): + if not self.may_contain(added_type): + return + pages = self.pages() if pages: - html.write('<li><span>%s:</span></li>' % self.phrase("add_to")) + self.render_addto_popup_title(self.phrase("add_to")) for page in pages: - html.write('<li><a href="javascript:void(0)" ' - 'onclick="pagetype_add_to_container(\'%s\', \'%s\'); reload_sidebar();"><img src="images/icon_%s.png"> %s</a></li>' % - (self.type_name(), page.name(), self.type_name(), page.title())) + self.render_addto_popup_entry(self.type_name(), page.name(), page.title()) + + + # Helper functions for layouting the add-to popup + @classmethod + def render_addto_popup_title(self, title): + html.write('<li><span>%s:</span></li>' % title) + + + @classmethod + def render_addto_popup_entry(self, type_name, name, title): + html.write('<li><a href="javascript:void(0)" ' + 'onclick="pagetype_add_to_container(\'%s\', \'%s\'); reload_sidebar();"><img src="images/icon_%s.png"> %s</a></li>' % + (type_name, name, type_name, title)) # Callback for the Javascript function pagetype_add_to_container(). The @@ -997,9 +1011,11 @@ class Container: page_type = page_types[page_type_name] target_page, need_sidebar_reload = page_type.add_element_via_popup(page_name, element_type, create_info) + # Redirect user to tha page this displays the thing we just added to if target_page: - # Redirect user to that page - html.write(target_page.page_url()) + if type(target_page) != str: + target_page = target_page.page_url() + html.write(target_page) html.write("\n%s" % (need_sidebar_reload and "true" or "false")) @@ -1069,7 +1085,7 @@ def page_handlers(): return page_handlers -def render_addto_popup(add_type): +def render_addto_popup(added_type): for page_type in page_types.values(): - if issubclass(page_type, Container) and page_type.may_contain(add_type): - page_type.render_addto_popup() + if issubclass(page_type, Container): + page_type.render_addto_popup(added_type)