You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2015/11/05 13:19:19 UTC
ambari git commit: AMBARI-13737 Unchecking all configuration in
recommendation pop results in incorrect message. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 5a93468b1 -> 6d71dab74
AMBARI-13737 Unchecking all configuration in recommendation pop results in incorrect message. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6d71dab7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6d71dab7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6d71dab7
Branch: refs/heads/branch-2.1
Commit: 6d71dab7404acfae3168eb616a5952b05e95efbd
Parents: 5a93468
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Thu Nov 5 13:58:08 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Thu Nov 5 13:58:08 2015 +0200
----------------------------------------------------------------------
ambari-web/app/mixins/common/configs/enhanced_configs.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6d71dab7/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 d4d709d..23f14ea 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -70,10 +70,11 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
* @type {string}
*/
dependenciesMessage: function() {
- var changedServices = this.get('changedProperties').filterProperty('saveRecommended', true).mapProperty('serviceName').uniq();
- var cfgLen = this.get('changedProperties').filterProperty('saveRecommended', true).length === 1 ? 'singular' : 'plural';
+ var changedServices = this.get('changedProperties').filterProperty('saveRecommended').mapProperty('serviceName').uniq();
+ var changedProperties = this.get('changedProperties').filterProperty('saveRecommended');
+ var cfgLen = changedProperties.length === 1 ? 'singular' : 'plural';
var sLen = changedServices.length === 1 ? 'singular' : 'plural';
- return Em.I18n.t('popup.dependent.configs.dependencies.config.' + cfgLen).format(this.get('changedProperties.length'))
+ return Em.I18n.t('popup.dependent.configs.dependencies.config.' + cfgLen).format(changedProperties.length)
+ Em.I18n.t('popup.dependent.configs.dependencies.service.' + sLen).format(changedServices.length);
}.property('changedProperties.length'),