You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2018/07/31 20:34:39 UTC
[ambari] branch trunk updated: AMBARI-24391. Properties filter in
Customize Services Page brings up LOGDIRS and PIDDIRS even if they dont
qualify (akovalenko)
This is an automated email from the ASF dual-hosted git repository.
akovalenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 731f7bf AMBARI-24391. Properties filter in Customize Services Page brings up LOGDIRS and PIDDIRS even if they dont qualify (akovalenko)
731f7bf is described below
commit 731f7bfdb5d1fcc8e84defec41af0f6fc6bd11d7
Author: Aleksandr Kovalenko <ak...@apache.org>
AuthorDate: Tue Jul 31 18:06:06 2018 +0300
AMBARI-24391. Properties filter in Customize Services Page brings up LOGDIRS and PIDDIRS even if they dont qualify (akovalenko)
---
.../wizard/step7/directories_theme_layout.hbs | 48 +++++++++++-----------
1 file changed, 25 insertions(+), 23 deletions(-)
diff --git a/ambari-web/app/templates/wizard/step7/directories_theme_layout.hbs b/ambari-web/app/templates/wizard/step7/directories_theme_layout.hbs
index 0d19a35..b74ebd1 100644
--- a/ambari-web/app/templates/wizard/step7/directories_theme_layout.hbs
+++ b/ambari-web/app/templates/wizard/step7/directories_theme_layout.hbs
@@ -23,33 +23,35 @@
<div class="panel panel-default">
{{#each row in view.content.sectionRows}}
{{#each section in row}}
- {{#view App.DirectoriesLayoutCategoryView}}
- <div class="panel-heading" {{action "toggleCollapsed" target="view"}}>
- <h3 class="panel-title">
- <i {{bindAttr class=":pull-right :panel-toggle view.isCollapsed:icon-angle-down:icon-angle-up"}}></i>
- <a class="panel-toggle category-header" {{QAAttr "category-header"}}>
- <span class="category-name" {{QAAttr "category-name"}}>{{section.displayName}}</span>
- </a>
- </h3>
- </div>
- <div class="panel-body collapse in" {{QAAttr "panel-body"}}>
- <div class="service-config-section">
- {{#each subRow in section.subsectionRows}}
- {{#each subsection in subRow}}
- {{#each config in subsection.configs}}
- {{#if config.widget}}
- {{#if config.isVisible}}
- {{#unless config.isHiddenByFilter}}
- {{view config.widget configBinding="config" canEditBinding="view.parentView.canEdit" sectionBinding="section" subSectionBinding="subsection" tabBinding="view.parentView.content" inlineControls=true}}
- {{/unless}}
+ {{#unless section.isHiddenByFilter}}
+ {{#view App.DirectoriesLayoutCategoryView}}
+ <div class="panel-heading" {{action "toggleCollapsed" target="view"}}>
+ <h3 class="panel-title">
+ <i {{bindAttr class=":pull-right :panel-toggle view.isCollapsed:icon-angle-down:icon-angle-up"}}></i>
+ <a class="panel-toggle category-header" {{QAAttr "category-header"}}>
+ <span class="category-name" {{QAAttr "category-name"}}>{{section.displayName}}</span>
+ </a>
+ </h3>
+ </div>
+ <div class="panel-body collapse in" {{QAAttr "panel-body"}}>
+ <div class="service-config-section">
+ {{#each subRow in section.subsectionRows}}
+ {{#each subsection in subRow}}
+ {{#each config in subsection.configs}}
+ {{#if config.widget}}
+ {{#if config.isVisible}}
+ {{#unless config.isHiddenByFilter}}
+ {{view config.widget configBinding="config" canEditBinding="view.parentView.canEdit" sectionBinding="section" subSectionBinding="subsection" tabBinding="view.parentView.content" inlineControls=true}}
+ {{/unless}}
+ {{/if}}
{{/if}}
- {{/if}}
+ {{/each}}
{{/each}}
{{/each}}
- {{/each}}
+ </div>
</div>
- </div>
- {{/view}}
+ {{/view}}
+ {{/unless}}
{{/each}}
{{/each}}
</div>