AMBARI-3391. Host level configs show overridden fields as editable. (srimanth)

ambari-web/app/templates/common/configs/overriddenProperty.hbs

@@ -20,11 +20,13 @@
     {{! Here serviceConfigBinding should ideally be serviceConfigPropertyBinding }}
     <div {{bindAttr class="overriddenSCP.errorMessage:error: :control-group :overrideField"}}>
       {{view overriddenSCP.viewClass serviceConfigBinding="overriddenSCP" categoryConfigsBinding="view.categoryConfigs"}}
-      {{view view.hostsCountView overriddenSCPBinding="overriddenSCP"}}
-      {{#if isNotDefaultValue}}
-        <a class="action" {{action "doRestoreDefaultValue" this target="view" }} ><i class="icon-undo"></i>Undo</a>
-      {{/if}}
-      <a class="action" {{action "removeOverride" overriddenSCP target="view" }} ><i class="icon-minus-sign"></i>Remove</a>
-      <span class="help-inline">{{overriddenSCP.errorMessage}}</span>
+      {{#if overriddenSCP.isEditable}}
+	      {{view view.hostsCountView overriddenSCPBinding="overriddenSCP"}}
+	      {{#if isNotDefaultValue}}
+	        <a class="action" {{action "doRestoreDefaultValue" this target="view" }} ><i class="icon-undo"></i>Undo</a>
+	      {{/if}}
+	      <a class="action" {{action "removeOverride" overriddenSCP target="view" }} ><i class="icon-minus-sign"></i>Remove</a>
+	      <span class="help-inline">{{overriddenSCP.errorMessage}}</span>
+	    {{/if}}
     </div>
 {{/each}}

ambari-web/app/templates/common/configs/service_config.hbs

@@ -68,17 +68,17 @@
                       <div {{bindAttr class=":entry-row isOverridden:overridden-property"}}>
                           <span {{bindAttr class="errorMessage:error: :control-group :control-label-span"}}>
                             <label class="control-label">
-                              {{#if App.supports.hostOverrides}}
-		                            {{#if isRestartRequired}}
-		                              <i class="icon-refresh restart-required-property" rel="tooltip" {{bindAttr title="restartRequiredMessage"}}></i>
-		                            {{/if}}
-		                          {{/if}}
                               {{displayName}}
                               {{#if App.supports.secureCluster}}
                                 {{#if isSecureConfig}}
                                   <a href="javascript:void(null);"><i class="icon-lock" rel="tooltip" data-toggle="tooltip" title="security knob"></i></a>
                                 {{/if}}
                               {{/if}}
+                              {{#if App.supports.hostOverrides}}
+                                {{#if isRestartRequired}}
+                                  <i class="icon-refresh restart-required-property" rel="tooltip" {{bindAttr title="restartRequiredMessage"}}></i>
+                                {{/if}}
+                              {{/if}}
                             </label>
                           </span>
                           <div class="controls">

ambari-web/app/views/common/configs/services_config.js

@@ -273,7 +273,13 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({
     var configs = this.get('serviceConfigs');
     var canEdit = this.get('canEdit');
     if (!canEdit && configs) {
-      configs.setEach('isEditable', false);
+      configs.forEach(function(c){
+        c.set('isEditable', false);
+        var overrides = c.get('overrides');
+        if (overrides!=null) {
+          overrides.setEach('isEditable', false);
+        }
+      });
     }
   },