浏览代码

AMBARI-6035 UI: treat structured_out as JSON, not stringified JSON. (Buzhor Denys via ababiichuk)

aBabiichuk 11 年之前
父节点
当前提交
d1ae61fef2

+ 1 - 2
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;
           }
         }

+ 1 - 1
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,