[checkmk-commits] Check_MK Git: check_mk: FIX: preselected "refresh" option did not reflect view settings

Module: check_mk Branch: master Commit: ebdb2f48101114605beadca4e626915bb3812540 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebdb2f48101114… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 2 16:28:17 2012 +0200 FIX: preselected "refresh" option did not reflect view settings --- ChangeLog | 6 ++++-- web/htdocs/views.py | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93992a3..32192bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.2.0b6 +1.2.0: Multisite: * FIX: Fixed layout of some dropdown fields in view filters * Make heading in each page clickable -> reload page @@ -7,9 +7,11 @@ * FIX: Fixed "select all" button for IE * FIX: Context links added by hooks are now hidden by the display option "B" again + * FIX: preselected "refresh" option did not reflect view settings + but was simply the first available option - usually 30. WATO: - * IX: Fixed "select all" button in hosts & folders for IE + * FIX: Fixed "select all" button in hosts & folders for IE Core: * FIX: Fixed "make_utf is not defined" error when having custom diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c14eac0..7c2000b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1534,7 +1534,13 @@ def view_linktitle(view): def view_optiondial(view, option, choices, help): vo = view_options(view["name"]) - value = vo.get(option, view.get(option, choices[0][0])) + # Darn: The option "refresh" has the name "browser_reload" in the + # view definition + if option == "refresh": + von = "browser_reload" + else: + von = option + value = vo.get(option, view.get(von, choices[0][0])) title = dict(choices).get(value, value) html.begin_context_buttons() # just to be sure # Remove unicode strings