ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject [48/64] [abbrv] ambari git commit: AMBARI-20604. Infinite spinner near config property (akovalenko)
Date Tue, 28 Mar 2017 22:15:25 GMT
AMBARI-20604. Infinite spinner near config property (akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/993cd02a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/993cd02a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/993cd02a

Branch: refs/heads/ambari-rest-api-explorer
Commit: 993cd02a9ad5b9610e8007885b582668066de429
Parents: d14dba6
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Tue Mar 28 13:57:13 2017 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Tue Mar 28 14:57:16 2017 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step7_controller.js          | 4 ++--
 ambari-web/app/templates/common/configs/overriddenProperty.hbs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/993cd02a/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index dd3bfcb..8e14b70 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -375,7 +375,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin,
App.E
         for (var prop in config.properties) {
           var fileName = App.config.getOriginalFileName(config.type);
           var serviceConfig = serviceConfigs.filterProperty('name', prop).findProperty('filename',
fileName);
-          if (serviceConfig) {
+          if (serviceConfig && serviceConfig.get('isOriginalSCP')) {
             var value = App.config.formatPropertyValue(serviceConfig, config.properties[prop]);
             var isFinal = !!(config.properties_attributes && config.properties_attributes.final
&& config.properties_attributes.final[prop]);
 
@@ -1172,7 +1172,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin,
App.E
           var modelGroup = App.ServiceConfigGroup.find(item.id);
           modelGroup.set('properties', []);
           item.properties.forEach(function (propertyData) {
-            var overriddenSCP, parentSCP = service.configs.filterProperty('filename', propertyData.filename).findProperty('name',
propertyData.name);
+            var overriddenSCP, parentSCP = service.configs.filterProperty('filename', propertyData.filename).filterProperty('isOriginalSCP').findProperty('name',
propertyData.name);
             if (parentSCP) {
               App.config.createOverride(parentSCP, propertyData, modelGroup)
             } else {

http://git-wip-us.apache.org/repos/asf/ambari/blob/993cd02a/ambari-web/app/templates/common/configs/overriddenProperty.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/overriddenProperty.hbs b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
index 7d8e594..ff3e812 100644
--- a/ambari-web/app/templates/common/configs/overriddenProperty.hbs
+++ b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
@@ -54,7 +54,7 @@
             <span class="help-block validation-block pull-right">{{view.overriddenSCP.errorMessage}}</span>
           {{/if}}
         {{else}}
-          <a class="action">{{view.overriddenSCP.group.switchGroupTextShort}}</a>
{{view App.SpinnerView}}
+          <a class="action">{{view.overriddenSCP.group.switchGroupTextShort}}</a>
         {{/if}}
       {{/if}}
     </div>


Mime
View raw message