[checkmk-commits] Improved error handling of failed drag updates

Module: check_mk Branch: master Commit: 5d6cd663becbddedffbb761d7cff74b99f522d3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d6cd663becbdd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 16:07:10 2016 +0100 Improved error handling of failed drag updates Change-Id: I672ee36bf434d70d9477d9427fbc2304cca12272 --- web/htdocs/js/checkmk.js | 13 +++++++++++++ web/htdocs/wato.py | 1 + 2 files changed, 14 insertions(+) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 88e137f..15e8513 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1825,9 +1825,22 @@ function finalize_dragging() var url = g_dragging.base_url + "&_index="+encodeURIComponent(index); call_ajax(url, { method : "GET", + response_handler : handle_finalize_dragging, + error_handler : handle_finalize_dragging_error, + plain_error : true }); } +function handle_finalize_dragging(handler_data, response_text) { + if (response_text != "") + alert("Failed to persist drag result: " + response_text); +} + +function handle_finalize_dragging_error(handler_data, status_code, error_msg) { + if (status_code != 0) + alert("Failed to persist drag result: (" + status_code + "): " + error_msg); +} + // TODO: Only register when needed? add_event_handler('mousemove', function(event) { return element_dragging(event); diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2951568..dc49052 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12289,6 +12289,7 @@ class ModeEditRuleset(WatoMode): ruleset.move_rule_to_top(rule) elif action == "move_to": ruleset.move_rule_to(rule, int(html.var("_index"))) + return "" else: ruleset.move_rule_to_bottom(rule)