You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2015/05/05 19:03:02 UTC
ambari git commit: AMBARI-10937. Filtering configs should not hide
tabs. Instead should disable selection. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 175e78472 -> 172dd8cf4
AMBARI-10937. Filtering configs should not hide tabs. Instead should disable selection. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/172dd8cf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/172dd8cf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/172dd8cf
Branch: refs/heads/trunk
Commit: 172dd8cf4c3e944a1d42d90f39108b2ad7ac22b6
Parents: 175e784
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Tue May 5 20:00:52 2015 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Tue May 5 20:00:52 2015 +0300
----------------------------------------------------------------------
.../templates/common/configs/service_config.hbs | 28 +++++++++-----------
.../common/configs/service_config_wizard.hbs | 4 +--
.../configs/service_config_container_view.js | 8 ++++++
.../views/common/configs/service_config_view.js | 1 +
4 files changed, 24 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/172dd8cf/ambari-web/app/templates/common/configs/service_config.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs
index 9270f19..d67c92c 100644
--- a/ambari-web/app/templates/common/configs/service_config.hbs
+++ b/ambari-web/app/templates/common/configs/service_config.hbs
@@ -96,22 +96,20 @@
{{#if view.supportsConfigLayout}}
<ul class="nav nav-tabs mbm">
{{#each tab in view.tabs}}
- {{#unless tab.isHiddenByFilter}}
- <li {{bindAttr class="tab.isActive:active" }}>
- <a href="#" {{action "setActiveTab" tab target="view"}} {{bindAttr data-target="tab.headingClass"}} data-toggle="tab">
- {{tab.displayName}}
- {{#if tab.isAdvanced}}
- {{#if controller.errorsCount}}
- <span class="badge badge-important">{{controller.errorsCount}}</span>
- {{/if}}
- {{else}}
- {{#if tab.errorsCount}}
- <span class="badge badge-important">{{tab.errorsCount}}</span>
- {{/if}}
+ <li {{bindAttr class="tab.isActive:active tab.isHiddenByFilter:disabled" }}>
+ <a href="#" {{action "setActiveTab" tab target="view"}} {{bindAttr data-target="tab.headingClass"}} data-toggle="tab">
+ {{tab.displayName}}
+ {{#if tab.isAdvanced}}
+ {{#if controller.errorsCount}}
+ <span class="badge badge-important">{{controller.errorsCount}}</span>
{{/if}}
- </a>
- </li>
- {{/unless}}
+ {{else}}
+ {{#if tab.errorsCount}}
+ <span class="badge badge-important">{{tab.errorsCount}}</span>
+ {{/if}}
+ {{/if}}
+ </a>
+ </li>
{{/each}}
</ul>
<div class="tab-content service-config-tab-content">
http://git-wip-us.apache.org/repos/asf/ambari/blob/172dd8cf/ambari-web/app/templates/common/configs/service_config_wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config_wizard.hbs b/ambari-web/app/templates/common/configs/service_config_wizard.hbs
index c12ae08..d3b74f2 100644
--- a/ambari-web/app/templates/common/configs/service_config_wizard.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_wizard.hbs
@@ -51,8 +51,8 @@
{{#if view.supportsConfigLayout}}
<ul class="nav nav-tabs mbm">
{{#each tab in view.tabs}}
- <li {{bindAttr class="tab.isActive:active" }}>
- <a href="#" {{bindAttr data-target="tab.headingClass"}} data-toggle="tab">
+ <li {{bindAttr class="tab.isActive:active tab.isHiddenByFilter:disabled" }}>
+ <a href="#" {{action "setActiveTab" tab target="view"}} {{bindAttr data-target="tab.headingClass"}} data-toggle="tab">
{{tab.displayName}}
{{#if tab.isAdvanced}}
{{#if controller.errorsCount}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/172dd8cf/ambari-web/app/views/common/configs/service_config_container_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_config_container_view.js b/ambari-web/app/views/common/configs/service_config_container_view.js
index df855ac..8b6a9ce 100644
--- a/ambari-web/app/views/common/configs/service_config_container_view.js
+++ b/ambari-web/app/views/common/configs/service_config_container_view.js
@@ -45,6 +45,14 @@ App.ServiceConfigContainerView = Em.ContainerView.extend({
didInsertElement: function () {
$('.loading').empty();
this._super();
+ },
+ setActiveTab: function (event) {
+ if (event.context.get('isHiddenByFilter')) return false;
+ this.get('tabs').forEach(function (tab) {
+ tab.set('isActive', false);
+ });
+ var currentTab = event.context;
+ currentTab.set('isActive', true);
}
}));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/172dd8cf/ambari-web/app/views/common/configs/service_config_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_config_view.js b/ambari-web/app/views/common/configs/service_config_view.js
index 31240a6..656c095 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -92,6 +92,7 @@ App.ServiceConfigView = Em.View.extend({
),
setActiveTab: function (event) {
+ if (event.context.get('isHiddenByFilter')) return false;
this.get('tabs').forEach(function (tab) {
tab.set('isActive', false);
});