You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/10/23 16:48:03 UTC
[49/50] [abbrv] ambari git commit: AMBARI-13542 Error count on Ranger
service tab does not match the total error count on configs tab. (atkach)
AMBARI-13542 Error count on Ranger service tab does not match the total error count on configs tab. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ac17444
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ac17444
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ac17444
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 2ac17444bcc4f542507188250ebd835ae067e87e
Parents: 6a10db2
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Fri Oct 23 16:34:12 2015 +0300
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Fri Oct 23 16:34:12 2015 +0300
----------------------------------------------------------------------
ambari-web/app/models/configs/objects/service_config.js | 2 +-
.../app/models/configs/objects/service_config_property.js | 6 ++++++
.../app/views/common/configs/widgets/config_widget_view.js | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ac17444/ambari-web/app/models/configs/objects/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/objects/service_config.js b/ambari-web/app/models/configs/objects/service_config.js
index 492f1c0..c4bad57 100644
--- a/ambari-web/app/models/configs/objects/service_config.js
+++ b/ambari-web/app/models/configs/objects/service_config.js
@@ -61,7 +61,7 @@ App.ServiceConfig = Ember.Object.extend({
category.incrementProperty('nonSlaveErrorCount');
masterErrors++;
}
- if (!item.get('isValid') && item.get('widget') && item.get('isVisible')) {
+ if (!item.get('isValid') && item.get('widget') && item.get('isVisible') && !item.get('hiddenBySection')) {
enhancedConfigsErrors++;
}
if (item.get('overrides')) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ac17444/ambari-web/app/models/configs/objects/service_config_property.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/objects/service_config_property.js b/ambari-web/app/models/configs/objects/service_config_property.js
index 2c7aa87..1124d54 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -161,6 +161,12 @@ App.ServiceConfigProperty = Em.Object.extend({
showAsTextBox: false,
/**
+ * config is invisible since wrapper section is hidden
+ * @type {boolean}
+ */
+ hiddenBySection: false,
+
+ /**
* @type {boolean}
*/
recommendedValueExists: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ac17444/ambari-web/app/views/common/configs/widgets/config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
index 9e120ce..934d9a9 100644
--- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
@@ -492,6 +492,7 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
themeResource = App.SubSectionTab.find().findProperty('name', subsectionConditionName);
}
themeResource.set('isHiddenByConfig', !valueAttributes['visible']);
+ themeResource.get('configs').setEach('hiddenBySection', !valueAttributes['visible']);
}
}
},