Repository: incubator-htrace Updated Branches: refs/heads/master 9c683a42e -> f48e7fea7
HTRACE-189. gui: improve error handling in a few places (cmccabe) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/f48e7fea Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/f48e7fea Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/f48e7fea Branch: refs/heads/master Commit: f48e7fea76c2a296aa93db33b633d874300dcfba Parents: 9c683a4 Author: Colin P. Mccabe <[email protected]> Authored: Tue Jun 16 18:09:04 2015 -0700 Committer: Colin Patrick Mccabe <[email protected]> Committed: Thu Jun 18 13:47:07 2015 -0700 ---------------------------------------------------------------------- htrace-webapp/src/main/web/app/search_view.js | 6 +++--- htrace-webapp/src/main/web/app/span_widget.js | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/f48e7fea/htrace-webapp/src/main/web/app/search_view.js ---------------------------------------------------------------------- diff --git a/htrace-webapp/src/main/web/app/search_view.js b/htrace-webapp/src/main/web/app/search_view.js index 52f9101..5144650 100644 --- a/htrace-webapp/src/main/web/app/search_view.js +++ b/htrace-webapp/src/main/web/app/search_view.js @@ -126,9 +126,9 @@ htrace.SearchView = Backbone.View.extend({ } }, error: function(model, response, options){ - this.searchResults.clear(); - var err = "Error " + JSON.stringify(response) + - " on span query " + query.url(); + searchView.searchResults.reset(); + var err = "Error " + JSON.stringify(response, null, 2) + + " on span query " + queryResults.url(); console.log(err); alert(err); searchView.searchInProgress = false; http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/f48e7fea/htrace-webapp/src/main/web/app/span_widget.js ---------------------------------------------------------------------- diff --git a/htrace-webapp/src/main/web/app/span_widget.js b/htrace-webapp/src/main/web/app/span_widget.js index bd981ab..ad5ea07 100644 --- a/htrace-webapp/src/main/web/app/span_widget.js +++ b/htrace-webapp/src/main/web/app/span_widget.js @@ -239,7 +239,11 @@ htrace.SpanWidget = function(params) { callback: function() { $.when(widget.span.reifyParents()).done(function (result) { console.log("reifyParents: result was '" + result + "'"); - widget.manager.searchResultsView.render(); + if (result != "") { + alert(result); + } else { + widget.manager.searchResultsView.render(); + } }); }, }); @@ -256,7 +260,11 @@ htrace.SpanWidget = function(params) { callback: function() { $.when(widget.span.reifyChildren()).done(function (result) { console.log("reifyChildren: result was '" + result + "'"); - widget.manager.searchResultsView.render(); + if (result != "") { + alert(result); + } else { + widget.manager.searchResultsView.render(); + } }); }, });
