Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: bb02094ea14b20115e8bfddf64b0a98fd13ddc7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb02094ea14b20… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 10:31:22 2016 +0100 Updated bug entries #0860 --- .bugs/859 | 1 + .bugs/860 | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/859 b/.bugs/859 index 1cbe7a2..550e4e5 100644 --- a/.bugs/859 +++ b/.bugs/859 @@ -5,6 +5,7 @@ State: done Date: 2016-02-09 15:28:09 Targetversion: 1.2.8 Class: bug + If you change the output_format for example to json, the response header is still html 2016-03-21 09:59:59: changed state open -> done diff --git a/.bugs/860 b/.bugs/860 index d03444a..c6cf005 100644 --- a/.bugs/860 +++ b/.bugs/860 @@ -1,9 +1,11 @@ Title: Bug in Daily 08.02.16: Ackn doesn't work any more Component: multisite -State: open +Class: bug +State: done Date: 2016-02-09 15:29:25 Targetversion: 1.2.8 -Class: bug It is not possible to acknowldge services anymore. Downtime works. The list of services was mit OK and CRIT services. + +2016-03-21 10:31:18: changed state open -> done

8 years, 6 months

3313 FIX Set correct mime type when exporting CSV and other non-HTML formats

by Mathias Kettner

Module: check_mk Branch: master Commit: e21b7e8b65d37eb9cc621f3d75ca784c538f70d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e21b7e8b65d37e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 10:25:26 2016 +0100 3313 FIX Set correct mime type when exporting CSV and other non-HTML formats Conflicts: .bugs/859 ChangeLog --- .bugs/859 | 7 ++++--- .werks/3313 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 26 ++++++++++++++++++++++++++ web/htdocs/views.py | 1 - web/htdocs/wato.py | 4 ++-- web/htdocs/webapi.py | 4 ++-- web/plugins/views/availability.py | 5 ++--- web/plugins/views/webservice.py | 1 - 9 files changed, 47 insertions(+), 12 deletions(-) diff --git a/.bugs/859 b/.bugs/859 index e53241e..1cbe7a2 100644 --- a/.bugs/859 +++ b/.bugs/859 @@ -1,9 +1,10 @@ Title: Changing the output_format doesn't change the response header Component: multisite -State: open +Class: bug +State: done Date: 2016-02-09 15:28:09 Targetversion: 1.2.8 Class: bug +If you change the output_format for example to json, the response header is still html -If you change the output_format for example to json, the mime type in the -response header is still html. +2016-03-21 09:59:59: changed state open -> done diff --git a/.werks/3313 b/.werks/3313 new file mode 100644 index 0000000..e6ac239 --- /dev/null +++ b/.werks/3313 @@ -0,0 +1,10 @@ +Title: Set correct mime type when exporting CSV and other non-HTML formats +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458550901 + + diff --git a/ChangeLog b/ChangeLog index 50cffd8..ba44d42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,7 @@ * 3236 FIX: Fixed host page of pnp4nagios... * 3293 FIX: Fixed graphs in IE with enabled compatibility mode (for IE < 8) * 3294 FIX: Fixed mixed languages when some users have localized GUI and some not... + * 3313 FIX: Set correct mime type when exporting CSV and other non-HTML formats WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index cf7fa88..a505076 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -170,8 +170,34 @@ class html(GUITester): self.auto_id += 1 return "id_%d" % self.auto_id + def set_output_format(self, f): self.output_format = f + if f == "json": + content_type = "application/json; charset=UTF-8" + + elif f == "jsonp": + content_type = "application/javascript; charset=UTF-8" + + elif f in ("csv", "csv_export"): # Cleanup: drop one of these + content_type = "text/csv; charset=UTF-8" + + elif f == "python": + content_type = "application/python; charset=UTF-8" + + elif f == "text": + content_type = "text/plain; charset=UTF-8" + + elif f == "html": + content_type = "text/html; charset=UTF-8" + + elif f == "pdf": + content_type = "application/pdf" + + else: + raise MKGeneralException(_("Unsupported context type '%s'") % f) + self.set_content_type(content_type) + def set_link_target(self, framename): self.link_target = framename diff --git a/web/htdocs/views.py b/web/htdocs/views.py index fc23571..d412f66 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2503,7 +2503,6 @@ def ajax_inv_render_tree(): render_inv_subtree_container(hostname, tree_id, invpath, node) def output_csv_headers(view): - html.req.content_type = "text/csv; charset=UTF-8" filename = '%s-%s.csv' % (view['name'], time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) if type(filename) == unicode: filename = filename.encode("utf-8") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c690c19..be6b91b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4736,7 +4736,7 @@ def render_audit_log(log, what, with_filename = False, hilite_others=False): html.write(htmlcode) def export_audit_log(): - html.req.content_type = "text/csv; charset=UTF-8" + html.set_output_format("csv") filename = 'wato-auditlog-%s_%s.csv' % (fmt_date(time.time()), fmt_time(time.time())) html.req.headers_out['Content-Disposition'] = 'attachment; filename=%s' % filename titles = ( @@ -13869,7 +13869,7 @@ def page_download_agent_output(): [host_name, ty]) if success: - html.set_content_type("text/plain; charset=UTF-8") + html.set_output_format("text") html.set_http_header("Content-Disposition", "Attachment; filename=" + host_name) html.write(agent_data) else: diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index f2ab9ae..5b09b20 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -96,10 +96,10 @@ def page_api(): raise response = { "result_code": 1, "result": str(e) } - output_format = html.var("output_format", "json") - if output_format == "json": + if html.output_format == "json": html.write(json.dumps(response)) else: + html.set_output_format("python") html.write(repr(response)) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index f6bf86d..88081b6 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -808,7 +808,7 @@ def output_availability_csv(what, av_data, avoptions): for (title, help), (text, css) in zip(cell_titles, row_cells): table.cell(title, text) - av_output_csv_mimetype(_("Check_MK-Availability")) + av_output_set_content_disposition(_("Check_MK-Availability")) availability_tables = availability.compute_availability_groups(what, av_data, avoptions) table.begin("av_items", output_format = "csv") for group_title, availability_table in availability_tables: @@ -825,8 +825,7 @@ def output_availability_csv(what, av_data, avoptions): [(_("Summary"), "")] + [("", "")] * pad, av_table["summary"]) table.end() -def av_output_csv_mimetype(title): - html.req.content_type = "text/csv; charset=UTF-8" +def av_output_set_content_disposition(title): filename = '%s-%s.csv' % (title, time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) if type(filename) == unicode: filename = filename.encode("utf-8") diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index e086b1f..888eef0 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -62,7 +62,6 @@ multisite_layouts["python"] = { def render_json(rows, view, group_painters, painters, num_columns, show_checkboxes, export=False): if export: - html.req.content_type = "appliation/json; charset=UTF-8" filename = '%s-%s.json' % (view['name'], time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) if type(filename) == unicode: filename = filename.encode("utf-8")

8 years, 6 months

Updated bug entries #0858

by Mathias Kettner

Module: check_mk Branch: master Commit: 0485e6c363710c80004ad9a60e4d56f93d56dabb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0485e6c363710c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 10:08:21 2016 +0100 Updated bug entries #0858 --- .bugs/858 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/858 b/.bugs/858 index cd2a2fd..cfa8d34 100644 --- a/.bugs/858 +++ b/.bugs/858 @@ -1,4 +1,4 @@ -Title: Discovery check lifes in history +Title: Discovery check sometimes does not detect config changes Component: checks State: open Date: 2016-02-09 15:25:38

8 years, 6 months

3304 Bulk deleting users is now available

by Simon Betz

Module: check_mk Branch: master Commit: 918eaee8f1b1277b6deab072a2b1475421500fef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=918eaee8f1b127… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 21 10:05:48 2016 +0100 3304 Bulk deleting users is now available --- .werks/3304 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/.werks/3304 b/.werks/3304 new file mode 100644 index 0000000..20517c2 --- /dev/null +++ b/.werks/3304 @@ -0,0 +1,9 @@ +Title: Bulk deleting users is now available +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.9i1 +Date: 1458551082 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 8ded7e5..50cffd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,6 +120,7 @@ * 3244 WATO BI Module: swap order of aggregation function and child node selection... * 3002 Treasure script wato_import.py: now able to set wato host tag groups * 3003 New treasure script: migrate_oldcmk2wato.py... + * 3304 Bulk deleting users is now available * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 15f1c04..c690c19 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9811,11 +9811,11 @@ def mode_users(phase): c = wato_confirm(_("Confirm deletion of user %s" % delid), _("Do you really want to delete the user %s?" % delid)) if c: - del users[delid] + delete_user(delid, users) userdb.save_users(users) - log_pending(SYNCRESTART, None, "edit-users", _("Deleted user %s" % (delid))) elif c == False: return "" + elif html.var('_sync'): try: if userdb.hook_sync(add_to_changelog = True, raise_exc = True): @@ -9827,6 +9827,9 @@ def mode_users(phase): else: raise MKUserError(None, str(e)) + elif html.var("_bulk_delete_users"): + return bulk_delete_users_after_confirm(users) + return None visible_custom_attrs = [ @@ -9839,11 +9842,21 @@ def mode_users(phase): entries = users.items() entries.sort(cmp = lambda a, b: cmp(a[1].get("alias", a[0]).lower(), b[1].get("alias", b[0]).lower())) + html.begin_form("bulk_delete_form", method = "POST") + table.begin("users", None, empty_text = _("No users are defined yet.")) online_threshold = time.time() - config.user_online_maxage for id, user in entries: table.row() + # Checkboxes + table.cell("<input type=button class=checkgroup name=_toggle_group" + " onclick=\"toggle_all_rows();\" value=\"%s\" />" % _('X'), + sortable=False, css="buttons") + + if id != config.user_id: + html.checkbox("_c_user_%s" % id) + user_connection_id = userdb.cleanup_connection_id(user.get('connector')) connection = userdb.get_connection(user_connection_id) @@ -9954,6 +9967,10 @@ def mode_users(phase): table.end() + html.button("_bulk_delete_users", _("Bulk Delete"), "submit", style="margin-top:10px") + html.hidden_fields() + html.end_form() + if not userdb.load_group_information().get("contact", {}): url = "wato.py?mode=contact_groups" html.write("<div class=info>" + @@ -9963,6 +9980,31 @@ def mode_users(phase): "notifications.") % url + "</div>") +def bulk_delete_users_after_confirm(users): + selected_users = [] + for varname in html.all_varnames_with_prefix("_c_user_"): + if html.get_checkbox(varname): + user = varname.split("_c_user_")[-1] + if user in users: + selected_users.append(user) + + if selected_users: + c = wato_confirm(_("Confirm deletion of %d users" % len(selected_users)), + _("Do you really want to delete %d users?" % len(selected_users))) + if c: + for user in selected_users: + delete_user(user, users) + elif c == False: + return "" + + userdb.save_users(users) + return + + +def delete_user(delid, users): + del users[delid] + log_pending(SYNCRESTART, None, "edit-users", _("Deleted user %s" % (delid))) + def mode_edit_user(phase): # Check if rule based notifications are enabled (via WATO)

8 years, 6 months

Reserved 20 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: e117bbd95108ccf5fe7bc1025b32f1e693b10232 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e117bbd95108cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 10:00:33 2016 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 996928c..3bd9bce 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3313 +3333

8 years, 6 months

3296 FIX Hiding pending changes related buttons after discarding changes

by Lars Michelsen

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 <lm(a)mathias-kettner.de> 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)

8 years, 6 months

Fixed broken graph painter

by Lars Michelsen

Module: check_mk Branch: master Commit: 035fecc6250a03ef70f2fe7c6eedffafadac62d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=035fecc6250a03… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 09:24:25 2016 +0100 Fixed broken graph painter --- web/plugins/views/painters.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index fa4abb2..46c13af 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -949,14 +949,15 @@ def paint_time_graph_cmk(row, show_timeranges=False): graph_render_options = {} if "host_metrics" in row: - metrics = row["host_metrics"] + available_metrics = row["host_metrics"] perf_data = row["host_perf_data"] else: - metrics = row["service_metrics"] + available_metrics = row["service_metrics"] perf_data = row["service_perf_data"] - if not metrics and perf_data: - return "", _("No historic metrics recorded.") + if not available_metrics and perf_data: + return "", _("No historic metrics recorded but performance data is available. " + "Maybe performance data processing is disabled.") return "", metrics.render_graphs_from_specification_html( graph_specification,

8 years, 6 months

3295 FIX Fixed exception in WATO git integration when modifying .gitingore file

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e3a3935b517ae5a29552d2de2f6aa39f8eaadae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e3a3935b517ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 09:15:17 2016 +0100 3295 FIX Fixed exception in WATO git integration when modifying .gitingore file --- .werks/3295 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 30 ++++++++++++++++++++++-------- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/.werks/3295 b/.werks/3295 new file mode 100644 index 0000000..537e4a0 --- /dev/null +++ b/.werks/3295 @@ -0,0 +1,10 @@ +Title: Fixed exception in WATO git integration when modifying .gitingore file +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458548090 + + diff --git a/ChangeLog b/ChangeLog index 8f824bc..9a72842 100644 --- a/ChangeLog +++ b/ChangeLog @@ -147,6 +147,7 @@ * 3270 FIX: Fix button [Deprecated Rulesets] within deprecated manual checks rulesets * 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 Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 691bff9..699bbc1 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4457,26 +4457,40 @@ def do_git_commit(): git_command(["config", "user.name", "check_mk"]) write_gitignore_files() + git_add_files() + git_command(["commit", "--untracked-files=no", "--author", author, "-m", + shell_quote(_("Initialized GIT for Check_MK"))]) - git_command(["add", ".gitignore", "*.d/wato"]) - git_command(["commit", "--untracked-files=no", "--author", author, "-m", shell_quote(_("Initialized GIT for Check_MK"))]) - - # Only commit, if something is changed - if os.popen("cd '%s' && git status --porcelain" % defaults.default_config_dir).read().strip(): + if git_has_pending_changes(): write_gitignore_files() - git_command(["add", "*.d/wato"]) + + # Writing the gitignore files might have reverted the change. So better re-check. + if git_has_pending_changes(): + git_add_files() + message = ", ".join(g_git_messages) if not message: message = _("Unknown configuration change") + git_command(["commit", "--author", author, "-m", shell_quote(message)]) +def git_add_files(): + git_command(["add", ".gitignore", "*.d/wato"]) + + +def git_has_pending_changes(): + return os.popen("cd '%s' && git status --porcelain" % + defaults.default_config_dir).read().strip() + + # Make sure that .gitignore-files are present and uptodate. Only files below the "wato" directories # should be under git control. The files in etc/check_mk/*.mk should not be put under control. -# -# FIXME TODO: Should also be written on regular commits to make it possible to update the files def write_gitignore_files(): file(defaults.default_config_dir + "/.gitignore", "w").write( + "# This file is under control of Check_MK. Please don't modify it.\n" + "# Your changes will be overwritten.\n" + "\n" "*\n" "!*.d\n" "!.gitignore\n"

8 years, 6 months

Better error message in painter in case of missing RRDs

by Mathias Kettner

Module: check_mk Branch: master Commit: e4c9a8b48425b0e258cf4203ee31d0ecac25dec1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4c9a8b48425b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 18 18:03:11 2016 +0100 Better error message in painter in case of missing RRDs --- web/plugins/views/painters.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 6fff243..fa4abb2 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -948,6 +948,16 @@ def paint_time_graph_cmk(row, show_timeranges=False): graph_data_range = { "time_range" : get_graph_timerange_from_painter_options() } graph_render_options = {} + if "host_metrics" in row: + metrics = row["host_metrics"] + perf_data = row["host_perf_data"] + else: + metrics = row["service_metrics"] + perf_data = row["service_perf_data"] + + if not metrics and perf_data: + return "", _("No historic metrics recorded.") + return "", metrics.render_graphs_from_specification_html( graph_specification, graph_data_range,

8 years, 6 months

3294 FIX Fixed mixed languages when some users have localized GUI and some not

by Lars Michelsen

Module: check_mk Branch: master Commit: 644bee46e8db25f0585fffe34671bc3baed4422d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=644bee46e8db25… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 18 16:20:17 2016 +0100 3294 FIX Fixed mixed languages when some users have localized GUI and some not When some of the GUI users are using a localized GUI and some are at the default setting (have no explicit language configured), it could happen that the later users sometimes see the GUI in the language another user has configured. --- .werks/3294 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/i18n.py | 7 +++++-- web/htdocs/index.py | 1 + 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/3294 b/.werks/3294 new file mode 100644 index 0000000..cdb14cd --- /dev/null +++ b/.werks/3294 @@ -0,0 +1,12 @@ +Title: Fixed mixed languages when some users have localized GUI and some not +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458314348 + +When some of the GUI users are using a localized GUI and some are at the default +setting (have no explicit language configured), it could happen that the later +users sometimes see the GUI in the language another user has configured. diff --git a/ChangeLog b/ChangeLog index c163cf5..8f824bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * 3290 FIX: Fixed broken event quick delete icon when used in dashlets * 3236 FIX: Fixed host page of pnp4nagios... * 3293 FIX: Fixed graphs in IE with enabled compatibility mode (for IE < 8) + * 3294 FIX: Fixed mixed languages when some users have localized GUI and some not... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/i18n.py b/web/htdocs/i18n.py index a51cd78..d9f8ede 100644 --- a/web/htdocs/i18n.py +++ b/web/htdocs/i18n.py @@ -128,6 +128,10 @@ def localize(lang, **kwargs): unlocalize() +def initialize(): + __builtin__._u = _u + unlocalize() + #. # .--User i18n-----------------------------------------------------------. # | _ _ _ _ ___ | @@ -151,5 +155,4 @@ def _u(text): return text -__builtin__._u = _u -unlocalize() +initialize() diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 7e8abc7..b65c788 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -43,6 +43,7 @@ def handler(req, fields = None, is_profiling = False): response_code = apache.OK try: + i18n.initialize() config.load_config() # load multisite.mk etc. init_profiling(is_profiling) html.init_modes()

8 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016