You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2015/09/09 12:55:37 UTC
ambari git commit: AMBARI-13044. FE: Config group has incorrect
number of hosts (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 50613bbdd -> e396e7976
AMBARI-13044. FE: Config group has incorrect number of hosts (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e396e797
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e396e797
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e396e797
Branch: refs/heads/branch-2.1
Commit: e396e79765e9a155b3fe99a198d4d92841e282c1
Parents: 50613bb
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Wed Sep 9 13:51:10 2015 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Wed Sep 9 13:51:10 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 10 +++++++++-
ambari-web/app/mixins/common/configs/enhanced_configs.js | 1 +
ambari-web/app/mixins/main/service/groups_mapping.js | 2 +-
ambari-web/app/styles/application.less | 5 +++++
.../app/templates/common/configs/service_config.hbs | 8 +++++++-
5 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e396e797/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index eb06a8a..978c03b 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -90,6 +90,13 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
versionLoaded: false,
+ /**
+ * Determines when data about config groups is loaded
+ * Including recommendations with information about hosts in the each group
+ * @type {boolean}
+ */
+ configGroupsAreLoaded: false,
+
dependentServiceNames: [],
/**
* defines which service configs need to be loaded to stepConfigs
@@ -263,7 +270,8 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
versionLoaded: false,
filter: '',
serviceConfigVersionNote: '',
- dependentServiceNames: []
+ dependentServiceNames: [],
+ configGroupsAreLoaded: false
});
this.get('filterColumns').setEach('selected', false);
this.clearConfigs();
http://git-wip-us.apache.org/repos/asf/ambari/blob/e396e797/ambari-web/app/mixins/common/configs/enhanced_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index dd55a14..0fb9539 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -343,6 +343,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
dependenciesSuccess: function (data, opt, params) {
this._saveRecommendedValues(data, params.initial, params.dataToSend.changed_configurations, params.selectedConfigGroup);
this.set("recommendationsConfigs", Em.get(data.resources[0] , "recommendations.blueprint.configurations"));
+ this.set('configGroupsAreLoaded', true);
if (!params.initial) {
this.updateDependentConfigs();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e396e797/ambari-web/app/mixins/main/service/groups_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/main/service/groups_mapping.js b/ambari-web/app/mixins/main/service/groups_mapping.js
index 93a760d..4da472f 100644
--- a/ambari-web/app/mixins/main/service/groups_mapping.js
+++ b/ambari-web/app/mixins/main/service/groups_mapping.js
@@ -28,7 +28,7 @@ App.GroupsMappingMixin = Em.Mixin.create({
/**
* Load config groups
* @param {String[]} serviceNames
- * @returns {$.Deferred()}
+ * @returns {$.Deferred}
* @method loadConfigGroups
*/
loadConfigGroups: function (serviceNames) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/e396e797/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index cf8e1a3..361ae57 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -5940,4 +5940,9 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox {
input[type="text"] {
margin-bottom: 2px;
}
+ .spinner {
+ background-size: 20px;
+ height: 20px;
+ width: 20px;
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e396e797/ambari-web/app/templates/common/configs/service_config.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs
index 888be9e..4ab0823 100644
--- a/ambari-web/app/templates/common/configs/service_config.hbs
+++ b/ambari-web/app/templates/common/configs/service_config.hbs
@@ -47,11 +47,17 @@
{{/if}}
{{#if view.supportsHostOverrides}}
<div class="alert alert-info">
+
{{t common.group}}
<div class="config-groups-dropdown">
- {{view App.ConfigGroupDropdownView}}
+ {{#if controller.configGroupsAreLoaded}}
+ {{view App.ConfigGroupDropdownView}}
+ {{else}}
+ <div class="pull-left spinner"></div>
+ {{/if}}
</div>
+
{{#isAccessible ADMIN}}
{{#if controller.isHostsConfigsPage}}
<a href="#" {{action "switchHostGroup" target="controller"}}>{{t common.change}}</a>