[checkmk-commits] 3296 FIX Hiding pending changes related buttons after discarding changes

Module: check_mk Branch: master Commit: 641112db38fb11bbba7ea21f71c75e3b998e527a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=641112db38fb11… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Mar 21 09:41:55 2016 +0100 3296 FIX Hiding pending changes related buttons after discarding changes --- .werks/3296 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 5 ++++- web/htdocs/wato.py | 3 ++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/3296 b/.werks/3296 new file mode 100644 index 0000000..efab846 --- /dev/null +++ b/.werks/3296 @@ -0,0 +1,10 @@ +Title: Hiding pending changes related buttons after discarding changes +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458549683 + + diff --git a/ChangeLog b/ChangeLog index 9a72842..8ded7e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -148,6 +148,7 @@ * 3100 FIX: fixed exception when trying to create a wato folder when that folder already exists * 3011 FIX: WATO host diagnostic page: prevent incorrectly filled input fields... * 3295 FIX: Fixed exception in WATO git integration when modifying .gitingore file + * 3296 FIX: Hiding pending changes related buttons after discarding changes Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index de12809..cf7fa88 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1259,8 +1259,11 @@ class html(GUITester): def unstash_vars(self): self.vars = self.var_stash.pop() + def render_javascript(self, code): + return "<script language=\"javascript\">\n%s\n</script>\n" % code + def javascript(self, code): - self.write("<script language=\"javascript\">\n%s\n</script>\n" % code) + self.write(self.render_javascript(code)) def final_javascript(self, code): self.final_javascript_code += code + "\n" diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7f36e1f..15f1c04 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4277,7 +4277,8 @@ def mode_changelog(phase): extract_snapshot(file_to_restore) activate_changes() log_commit_pending() - return None, _("Successfully discarded all pending changes.") + return None, HTML(_("Successfully discarded all pending changes.") \ + + html.render_javascript("hide_changes_buttons();")) # Give hooks chance to do some pre-activation things (and maybe stop # the activation)