浏览代码

AMBARI-10215. Support config-groups functionality for enhanced-configs (onechiporenko)

Oleg Nechiporenko 10 年之前
父节点
当前提交
e2ea86f4fa

+ 4 - 1
ambari-web/app/templates/common/configs/service_config_category.hbs

@@ -121,7 +121,10 @@
                 <span class="help-inline">{{warnMessage}}</span>
               </div>
               {{#if this.isOverridden}}
-                {{view App.ServiceConfigView.SCPOverriddenRowsView serviceConfigPropertyBinding="this" isDefaultGroupSelectedBinding="controller.selectedConfigGroup.isDefault"}}
+                {{view App.ServiceConfigView.SCPOverriddenRowsView
+                  serviceConfigPropertyBinding="this"
+                  isDefaultGroupSelectedBinding="controller.selectedConfigGroup.isDefault"
+                }}
               {{/if}}
               {{#if this.isComparison}}
                 {{view App.ServiceConfigView.SCPComparisonRowsView serviceConfigPropertyBinding="this"}}

+ 6 - 4
ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs

@@ -29,12 +29,14 @@
         {{/if}}
       </div>
     </div>
-    {{view App.RestoreConfigView visibleBinding="view.undoAllowed"}}
+    {{#if view.config.isOriginalSCP}}
+      {{view App.RestoreConfigView visibleBinding="view.undoAllowed"}}
+    {{/if}}
     {{#if view.overrideAllowed}}
       {{#isAccessible ADMIN}}
         <div class="pull-left action-button">
           <a class="btn btn-small" href="#" data-toggle="tooltip"
-            {{action "createOverrideProperty" view target="view.parentView"}}
+            {{action "createOverrideProperty" view.config target="view.parentView"}}
             {{translateAttr data-original-title="common.override"}}>
             <i class="icon-plus-sign"></i>
           </a>
@@ -46,11 +48,11 @@
   <div class="ui-slider-wrapper">
     {{view Ember.TextField valueBinding="view.config.value" class="input-mini slider-input"}}
   </div>
-  {{#if view.config.isOverridden}}
+  {{#if view.config.overrides.length}}
     {{view App.SliderConfigWidgetOverrideView
       serviceConfigPropertyBinding="view.config"
       isDefaultGroupSelectedBinding="controller.selectedConfigGroup.isDefault"
     }}
   {{/if}}
   <div class="clearfix"></div>
-</div>
+</div>