瀏覽代碼

AMBARI-15459. Override button is shown on the host configs page (onechiporenko)

Oleg Nechiporenko 9 年之前
父節點
當前提交
3cc686f648

+ 2 - 0
ambari-web/app/controllers/main/host/configs_service.js

@@ -24,6 +24,8 @@ App.MainHostServiceConfigsController = App.MainServiceInfoConfigsController.exte
   typeTagToHostMap: null,
   configKeyToConfigMap: null,
 
+  canEdit: false,
+
   /**
    * On load function
    */

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

@@ -113,7 +113,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
    */
   canEdit: function () {
     return (this.get('selectedVersion') == this.get('currentDefaultVersion') || !this.get('selectedConfigGroup.isDefault'))
-        && !this.get('isCompareMode') && App.isAuthorized('SERVICE.MODIFY_CONFIGS') && !this.get('isHostsConfigsPage');
+        && !this.get('isCompareMode') && App.isAuthorized('SERVICE.MODIFY_CONFIGS');
   }.property('selectedVersion', 'isCompareMode', 'currentDefaultVersion', 'selectedConfigGroup.isDefault'),
 
   serviceConfigs: Em.computed.alias('App.config.preDefinedServiceConfigs'),

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

@@ -69,7 +69,9 @@
                       &nbsp;{{t services.service.config.configHistory.configGroup}}</span>
                   {{/if}}
                 {{/if}}
-                {{view App.ControlsView serviceConfigPropertyBinding="this"}}
+                {{#if controller.canEdit}}
+                  {{view App.ControlsView serviceConfigPropertyBinding="this"}}
+                {{/if}}
                 <span class="help-inline">{{errorMessage}}</span>
                 <span class="help-inline">{{warnMessage}}</span>
               </div>