[checkmk-commits] Check_MK Git: check_mk: #1544 FIX Fixed exception in complain phase in view editor

Module: check_mk Branch: master Commit: 008e7e2b8329b309f257c81fbd19772fc024b6fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=008e7e2b8329b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 10:09:52 2014 +0100 #1544 FIX Fixed exception in complain phase in view editor Fixed exception "Internal error:: No datasource defined." in view editor when editing a view and getting an invalid input error which leads the user to the complain phase. --- .werks/1544 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/views.py | 1 + 3 files changed, 13 insertions(+) diff --git a/.werks/1544 b/.werks/1544 new file mode 100644 index 0000000..314fd97 --- /dev/null +++ b/.werks/1544 @@ -0,0 +1,11 @@ +Title: Fixed exception in complain phase in view editor +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417424913 +Class: fix + +Fixed exception "Internal error:: No datasource defined." in view editor +when editing a view and getting an invalid input error which leads the +user to the complain phase. diff --git a/ChangeLog b/ChangeLog index 80be8df..5875a2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,7 @@ * 1538 FIX: Only allow switching sites on/off when permitted to... * 1539 FIX: Fixed refreshing of PNP graphs in dashboards... * 1543 FIX: Hosttag columns are now available right ater creating a tag... + * 1544 FIX: Fixed exception in complain phase in view editor... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b8f46ae..8076d6a 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -679,6 +679,7 @@ def transform_valuespec_value_to_view(view): # view is the new dict object to be updated. def create_view_from_valuespec(old_view, view): ds_name = old_view.get('datasource', html.var('datasource')) + view['datasource'] = ds_name datasource = multisite_datasources[ds_name] vs_value = {} for ident, vs in view_editor_specs(ds_name):