ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject ambari git commit: AMBARI-13542 Error count on Ranger service tab does not match the total error count on configs tab. (atkach)
Date Fri, 23 Oct 2015 13:30:56 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 69df735a4 -> 86a047583


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/86a04758
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/86a04758
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/86a04758

Branch: refs/heads/branch-2.1
Commit: 86a04758319819dfc45c4b3fbcee90a6eeafcf45
Parents: 69df735
Author: Andrii Tkach <atkach@hortonworks.com>
Authored: Fri Oct 23 16:26:51 2015 +0300
Committer: Andrii Tkach <atkach@hortonworks.com>
Committed: Fri Oct 23 16:30:21 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/86a04758/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/86a04758/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 0b0c2c5..6f7c1b9 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -163,6 +163,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/86a04758/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']);
       }
     }
   },


Mime
View raw message