Browse Source

AMBARI-3870. Config groups - Read only configs are being made editable (alexantonenko)

Alex Antonenko 12 years ago
parent
commit
093c8aff88
1 changed files with 5 additions and 6 deletions
  1. 5 6
      ambari-web/app/controllers/main/service/info/configs.js

+ 5 - 6
ambari-web/app/controllers/main/service/info/configs.js

@@ -621,15 +621,14 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
           console.debug("createOverrideProperty(): Added:", newSCP, " to main-property:", serviceConfigProperty)
         }
       }
-      // serviceConfigProperty.serviceConfig = componentConfig;
-      if (App.supports.hostOverrides) {
-        serviceConfigProperty.set('isEditable', defaultGroupSelected && !this.get('isHostsConfigsPage'));
-      } else {
-        if (App.get('isAdmin')) {
+      if (App.get('isAdmin')) {
+        if(defaultGroupSelected && !this.get('isHostsConfigsPage')){
           serviceConfigProperty.set('isEditable', serviceConfigProperty.get('isReconfigurable'));
-        } else {
+        }else{
           serviceConfigProperty.set('isEditable', false);
         }
+      } else {
+        serviceConfigProperty.set('isEditable', false);
       }
       componentConfig.configs.pushObject(serviceConfigProperty);
       serviceConfigProperty.validate();