Updated Branches: refs/heads/trunk bf7473463 -> 093c8aff8
AMBARI-3870. Config groups - Read only configs are being made editable (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/093c8aff Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/093c8aff Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/093c8aff Branch: refs/heads/trunk Commit: 093c8aff8898067a18d414353f818d2baf96f53e Parents: bf74734 Author: Alex Antonenko <[email protected]> Authored: Mon Nov 25 15:30:53 2013 +0200 Committer: Alex Antonenko <[email protected]> Committed: Mon Nov 25 15:30:53 2013 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/service/info/configs.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/093c8aff/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index c2d6ae0..0a18dd0 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/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();
