Sfoglia il codice sorgente

AMBARI-3919.When managing configs for a non-default group, the default configs are non-editable but "Remove" button is still there for Custom sections. (akovalenko)

Aleksandr Kovalenko 11 anni fa
parent
commit
b7d29d1cf5

+ 3 - 2
ambari-web/app/models/service_config.js

@@ -191,8 +191,9 @@ App.ServiceConfigProperty = Ember.Object.extend({
   isRemovable: function() {
     var isOriginalSCP = this.get('isOriginalSCP');
     var isUserProperty = this.get('isUserProperty');
-    // Removable when this is a user property, or it is not an original property
-    return isUserProperty || !isOriginalSCP;
+    var isEditable = this.get('isEditable');
+    // Removable when this is a user property, or it is not an original property and it is editable
+    return isEditable && (isUserProperty || !isOriginalSCP);
   }.property('isUserProperty', 'isOriginalSCP'),
   init: function () {
     if(this.get("displayType")=="password"){

+ 2 - 2
ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs

@@ -40,10 +40,10 @@
             </button>
             <ul class="dropdown-menu">
               <li {{bindAttr class="view.isRenameButtonDisabled:disabled"}}>
-                <a  rel="button-info-dropdown" {{bindAttr data-original-title="view.renameButtonTooltip"}} {{action renameConfigGroup target="controller"}}>{{t services.service.config_groups_popup.rename}}</a>
+                <a href="" rel="button-info-dropdown" {{bindAttr data-original-title="view.renameButtonTooltip"}} {{action renameConfigGroup target="controller"}}>{{t services.service.config_groups_popup.rename}}</a>
               </li>
               <li {{bindAttr class="view.isDuplicateButtonDisabled:disabled"}}>
-                <a  rel="button-info-dropdown" {{bindAttr data-original-title="view.duplicateButtonTooltip"}} {{action duplicateConfigGroup target="controller"}}>{{t services.service.config_groups_popup.duplicate}}</a>
+                <a href="" rel="button-info-dropdown" {{bindAttr data-original-title="view.duplicateButtonTooltip"}} {{action duplicateConfigGroup target="controller"}}>{{t services.service.config_groups_popup.duplicate}}</a>
               </li>
             </ul>
           </div>