Repository: ambari Updated Branches: refs/heads/trunk 922d38bf4 -> d1ae61fef
AMBARI-6035 UI: treat structured_out as JSON, not stringified JSON. (Buzhor Denys via ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d1ae61fe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d1ae61fe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d1ae61fe Branch: refs/heads/trunk Commit: d1ae61fef25c31d5da346305a24c8430e50e42d9 Parents: 922d38b Author: aBabiichuk <[email protected]> Authored: Thu Jun 5 19:41:54 2014 +0300 Committer: aBabiichuk <[email protected]> Committed: Thu Jun 5 19:42:09 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step3_controller.js | 3 +-- ambari-web/app/views/wizard/controls_view.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d1ae61fe/ambari-web/app/controllers/wizard/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js index cd32d91..397bc39 100644 --- a/ambari-web/app/controllers/wizard/step3_controller.js +++ b/ambari-web/app/controllers/wizard/step3_controller.js @@ -840,8 +840,7 @@ App.WizardStep3Controller = Em.Controller.extend({ var hostInfo = this.get("hostCheckWarnings").findProperty('name', name); if (task.Tasks.status == "FAILED" || task.Tasks.status == "COMPLETED" || task.Tasks.status == "TIMEDOUT") { if (task.Tasks.status == "COMPLETED") { - var structured_out = jQuery.parseJSON(task.Tasks.structured_out); - if(structured_out && structured_out.host_resolution_check.failed_count == 0) { + if (Em.get(task, "Tasks.structured_out.host_resolution_check.failed_count") == 0) { return; } } http://git-wip-us.apache.org/repos/asf/ambari/blob/d1ae61fe/ambari-web/app/views/wizard/controls_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/controls_view.js b/ambari-web/app/views/wizard/controls_view.js index eb327cb..aa4aff2 100644 --- a/ambari-web/app/views/wizard/controls_view.js +++ b/ambari-web/app/views/wizard/controls_view.js @@ -913,7 +913,7 @@ App.CheckDBConnectionView = Ember.View.extend({ getTaskInfoSuccess: function(data) { var task = data.Tasks; if (task.status === 'COMPLETED') { - var structuredOut = JSON.parse(task.structured_out).db_connection_check; + var structuredOut = task.structured_out.db_connection_check; if (structuredOut.exit_code != 0) { this.set('responseFromServer', { stderr: task.stderr,
