ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject git commit: AMBARI-5595. Installer wizard service confog page: JS reference error encountered when ambari-agent is not installed on ambari-server host. (jaimin)
Date Mon, 02 Jun 2014 21:29:27 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 5cae75eca -> 9699b63bc


AMBARI-5595. Installer wizard service confog page: JS reference error encountered when ambari-agent
is not installed on ambari-server host. (jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9699b63b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9699b63b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9699b63b

Branch: refs/heads/trunk
Commit: 9699b63bc81abbcf5e89b75b85eda003540b2a39
Parents: 5cae75e
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Mon Jun 2 14:29:04 2014 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Mon Jun 2 14:29:04 2014 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step7_controller.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9699b63b/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index b6b675a..0273c86 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -965,8 +965,13 @@ App.WizardStep7Controller = Em.Controller.extend({
    */
   getAmbariDatabaseSuccess: function (data) {
     var hiveDBHostname = this.get('stepConfigs').findProperty('serviceName', 'HIVE').configs.findProperty('name',
'hivemetastore_host').value;
-    var ambariDBInfo = JSON.stringify(data.hostComponents[0].RootServiceHostComponents.properties);
-    this.set('mySQLServerConflict', ambariDBInfo.indexOf('mysql') > 0 && ambariDBInfo.indexOf(hiveDBHostname)
> 0);
+    var ambariServiceHostComponents = data.hostComponents;
+    if (!!ambariServiceHostComponents.length) {
+      var ambariDBInfo = JSON.stringify(ambariServiceHostComponents[0].RootServiceHostComponents.properties);
+      this.set('mySQLServerConflict', ambariDBInfo.indexOf('mysql') > 0 && ambariDBInfo.indexOf(hiveDBHostname)
> 0);
+    } else {
+      this.set('mySQLServerConflict', false);
+    }
   },
 
   /**


Mime
View raw message