Kaynağa Gözat

AMBARI-3968. Installer - Removal of parent config-group custom-config possible. (akovalenko via Denys Buzhor)

Aleksandr Kovalenko 11 yıl önce
ebeveyn
işleme
2743782f45

+ 4 - 3
ambari-web/app/templates/common/configs/overriddenProperty.hbs

@@ -15,13 +15,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-
 {{#each overriddenSCP in view.serviceConfigProperty.overrides}}
     {{! Here serviceConfigBinding should ideally be serviceConfigPropertyBinding }}
     <div {{bindAttr class="overriddenSCP.errorMessage:error: :control-group :overrideField"}}>
       {{view overriddenSCP.viewClass serviceConfigBinding="overriddenSCP" categoryConfigsBinding="view.categoryConfigs"}}
-      {{#if overriddenSCP.group}}
-        <a class="action" {{action selectConfigGroup overriddenSCP.group target="controller"}}>{{overriddenSCP.group.displayName}}</a>
+      {{#if view.isDefaultGroupSelected}}
+        {{#if overriddenSCP.group}}
+            <a class="action" {{action selectConfigGroup overriddenSCP.group target="controller"}}>{{overriddenSCP.group.displayName}}</a>
+        {{/if}}
       {{/if}}
       {{#if overriddenSCP.isEditable}}
 	      {{#if isNotDefaultValue}}

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

@@ -135,7 +135,7 @@
                                   <span class="help-inline">{{warnMessage}}</span>
                               </div>
                             {{#if this.isOverridden}}
-                              {{view App.ServiceConfigView.SCPOverriddenRowsView serviceConfigPropertyBinding="this"}}
+                              {{view App.ServiceConfigView.SCPOverriddenRowsView serviceConfigPropertyBinding="this" isDefaultGroupSelectedBinding="controller.selectedConfigGroup.isDefault"}}
                             {{/if}}
                           </div>
                       </div>