You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/08/06 09:56:56 UTC
ambari git commit: AMBARI-12658 Customize Services Page can't be
loaded when using HDP 2.0 or HDP 2.1. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 35ea40faa -> 6dc2c7f75
AMBARI-12658 Customize Services Page can't be loaded when using HDP 2.0 or HDP 2.1. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6dc2c7f7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6dc2c7f7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6dc2c7f7
Branch: refs/heads/trunk
Commit: 6dc2c7f7546252afadac28273413ef14c90348e6
Parents: 35ea40f
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Aug 6 10:55:08 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Aug 6 10:55:08 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard.js | 13 +++++++++----
ambari-web/app/utils/configs/config_property_helper.js | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6dc2c7f7/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index f961f79..b45cfb4 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -1217,18 +1217,23 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
loadConfigThemes: function () {
var self = this;
var dfd = $.Deferred();
- if (App.get('isClusterSupportsEnhancedConfigs') && !this.get('stackConfigsLoaded')) {
+ if (!this.get('stackConfigsLoaded')) {
var serviceNames = App.StackService.find().filter(function (s) {
return s.get('isSelected') || s.get('isInstalled');
}).mapProperty('serviceName');
// Load stack configs before loading themes
App.config.loadClusterConfigsFromStack().always(function() {
App.config.loadConfigsFromStack(serviceNames).done(function () {
- self.loadConfigThemeForServices(serviceNames).always(function () {
+ if (App.get('isClusterSupportsEnhancedConfigs')) {
+ self.loadConfigThemeForServices(serviceNames).always(function () {
+ self.set('stackConfigsLoaded', true);
+ App.themesMapper.generateAdvancedTabs(serviceNames);
+ dfd.resolve();
+ });
+ } else {
self.set('stackConfigsLoaded', true);
- App.themesMapper.generateAdvancedTabs(serviceNames);
dfd.resolve();
- });
+ }
});
});
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6dc2c7f7/ambari-web/app/utils/configs/config_property_helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/config_property_helper.js b/ambari-web/app/utils/configs/config_property_helper.js
index 209015c..cc74950 100644
--- a/ambari-web/app/utils/configs/config_property_helper.js
+++ b/ambari-web/app/utils/configs/config_property_helper.js
@@ -264,7 +264,7 @@ module.exports = {
var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName');
var zkHostPort = zkHosts;
var regex = "\\w*:(\\d+)"; //regex to fetch the port
- var portValue = configProperty.get('recommendedValue').match(new RegExp(regex));
+ var portValue = configProperty.get('recommendedValue') && configProperty.get('recommendedValue').match(new RegExp(regex));
if (!portValue) return;
if (portValue[1]) {
for ( var i = 0; i < zkHosts.length; i++ ) {