You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/10/29 10:41:27 UTC
[1/3] ambari git commit: AMBARI-13623 Ranger smart config: Sync
source multiselectbox is colliding with subsection-tab. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 60925f39b -> e593c5ae3
AMBARI-13623 Ranger smart config: Sync source multiselectbox is colliding with subsection-tab. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d18c4e27
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d18c4e27
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d18c4e27
Branch: refs/heads/trunk
Commit: d18c4e272f5e45b8017cd8e6a1802963f93c875a
Parents: 60925f3
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Oct 29 11:13:00 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Oct 29 11:40:56 2015 +0200
----------------------------------------------------------------------
.../app/templates/common/configs/service_config_layout_tab.hbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d18c4e27/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs b/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
index 4c9dccf..f78952c 100644
--- a/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
@@ -48,7 +48,7 @@
{{/if}}
{{/each}}
{{#if subsection.showTabs}}
- <ul class="nav nav-tabs mbm config-tabs">
+ <ul class="nav nav-tabs mbm">
{{#each subSectionTab in subsection.subSectionTabs}}
<li rel='tooltip' {{bindAttr class="subSectionTab.isActive:active subSectionTab.isVisible::disabled" data-original-title="tab.tooltipMsg"}}>
<a href="#" {{action setActiveSubTab subSectionTab target="view"}}{{bindAttr data-target="subSectionTab.id"}} data-toggle="tab">
[2/3] ambari git commit: AMBARI-13622 Incorrect validation shown
while enabling ranger plugin for storm service. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-13622 Incorrect validation shown while enabling ranger plugin for storm service. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cf9eb74b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cf9eb74b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cf9eb74b
Branch: refs/heads/trunk
Commit: cf9eb74b63f270213724dbae3bf6ee6d00930736
Parents: d18c4e2
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Oct 29 11:13:16 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Oct 29 11:40:57 2015 +0200
----------------------------------------------------------------------
.../config_recommendation_popup.hbs | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cf9eb74b/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs b/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
index c45e435..4c057a7 100644
--- a/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
@@ -43,15 +43,17 @@
{{/if}}
{{#if property.error}}
{{#if property.isVisible}}
- <tr>
- <td>{{property.serviceName}}</td>
- <td>{{property.name}}</td>
- <td>{{property.value}}</td>
- <td>
- <div class="property-message">{{property.errorMessage}}</div>
- <div class="property-description">{{property.description}}</div>
- </td>
- </tr>
+ {{#unless property.hiddenBySection}}
+ <tr>
+ <td>{{property.serviceName}}</td>
+ <td>{{property.name}}</td>
+ <td>{{property.value}}</td>
+ <td>
+ <div class="property-message">{{property.errorMessage}}</div>
+ <div class="property-description">{{property.description}}</div>
+ </td>
+ </tr>
+ {{/unless}}
{{/if}}
{{/if}}
{{/each}}
[3/3] ambari git commit: AMBARI-13624 Ranger Smart config: Filtering
a config shows Ranger Admin and Ranger Audit tab incorrectly active.
(ababiichuk)
Posted by ab...@apache.org.
AMBARI-13624 Ranger Smart config: Filtering a config shows Ranger Admin and Ranger Audit tab incorrectly active. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e593c5ae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e593c5ae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e593c5ae
Branch: refs/heads/trunk
Commit: e593c5ae3c8861978fe373c61155955d0409164e
Parents: cf9eb74
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Oct 29 11:36:18 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Oct 29 11:40:58 2015 +0200
----------------------------------------------------------------------
.../app/models/configs/theme/sub_section.js | 4 +++-
.../app/models/configs/theme/sub_section_tab.js | 4 +++-
ambari-web/test/models/configs/section_test.js | 19 +++++++++++++------
.../test/models/configs/sub_section_test.js | 11 ++++++++---
4 files changed, 27 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e593c5ae/ambari-web/app/models/configs/theme/sub_section.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/theme/sub_section.js b/ambari-web/app/models/configs/theme/sub_section.js
index ed3c7a2..ce26a3c 100644
--- a/ambari-web/app/models/configs/theme/sub_section.js
+++ b/ambari-web/app/models/configs/theme/sub_section.js
@@ -182,7 +182,9 @@ App.SubSection = DS.Model.extend({
* @type {boolean}
*/
isHiddenByFilter: function () {
- var configs = this.get('configs');
+ var configs = this.get('configs').filter(function(c) {
+ return !c.get('hiddenBySection') && c.get('isVisible');
+ });
return configs.length ? configs.everyProperty('isHiddenByFilter', true) : false;
}.property('configs.@each.isHiddenByFilter'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/e593c5ae/ambari-web/app/models/configs/theme/sub_section_tab.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/theme/sub_section_tab.js b/ambari-web/app/models/configs/theme/sub_section_tab.js
index ca42aeb..d5d5349 100644
--- a/ambari-web/app/models/configs/theme/sub_section_tab.js
+++ b/ambari-web/app/models/configs/theme/sub_section_tab.js
@@ -76,7 +76,9 @@ App.SubSectionTab = DS.Model.extend({
* @type {boolean}
*/
isHiddenByFilter: function () {
- var configs = this.get('configs');
+ var configs = this.get('configs').filter(function(c) {
+ return !c.get('hiddenBySection') && c.get('isVisible');
+ });
return configs.length ? configs.everyProperty('isHiddenByFilter', true) : false;
}.property('configs.@each.isHiddenByFilter'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/e593c5ae/ambari-web/test/models/configs/section_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/configs/section_test.js b/ambari-web/test/models/configs/section_test.js
index 055c532..967534e 100644
--- a/ambari-web/test/models/configs/section_test.js
+++ b/ambari-web/test/models/configs/section_test.js
@@ -56,24 +56,31 @@ describe('App.Section', function () {
},
{
subSections: [
- App.SubSection.createRecord({configs: [{isHiddenByFilter: false, isVisible: true}, {isHiddenByFilter: false, isVisible: true}]}),
- App.SubSection.createRecord({configs: [{isHiddenByFilter: false, isVisible: true}, {isHiddenByFilter: false, isVisible: true}]})
+ App.SubSection.createRecord({configs: [Em.Object.create({isHiddenByFilter: false, isVisible: true}), Em.Object.create({isHiddenByFilter: false, isVisible: true})]}),
+ App.SubSection.createRecord({configs: [Em.Object.create({isHiddenByFilter: false, isVisible: true}), Em.Object.create({isHiddenByFilter: false, isVisible: true})]})
],
m: 'no subsections are hidden',
e: false
},
{
subSections: [
- App.SubSection.createRecord({configs: [{isHiddenByFilter: true, isVisible: true}, {isHiddenByFilter: true, isVisible: true}]}),
- App.SubSection.createRecord({configs: [{isHiddenByFilter: false, isVisible: true}, {isHiddenByFilter: false, isVisible: true}]})
+ App.SubSection.createRecord({configs: [Em.Object.create({isHiddenByFilter: true, isVisible: false, hiddenBySection: false}), Em.Object.create({isHiddenByFilter: true, isVisible: true, hiddenBySection: true})]})
+ ],
+ m: 'no subsections are hidden (hiddenBySection)',
+ e: false
+ },
+ {
+ subSections: [
+ App.SubSection.createRecord({configs: [Em.Object.create({isHiddenByFilter: true, isVisible: true}), Em.Object.create({isHiddenByFilter: true, isVisible: true})]}),
+ App.SubSection.createRecord({configs: [Em.Object.create({isHiddenByFilter: false, isVisible: true}), Em.Object.create({isHiddenByFilter: false, isVisible: true})]})
],
m: 'one subsection is hidden',
e: false
},
{
subSections: [
- App.SubSection.createRecord({configs: [{isHiddenByFilter: true, isVisible: true}, {isHiddenByFilter: true, isVisible: true}]}),
- App.SubSection.createRecord({configs: [{isHiddenByFilter: true, isVisible: true}, {isHiddenByFilter: true, isVisible: true}]})
+ App.SubSection.createRecord({configs: [Em.Object.create({isHiddenByFilter: true, isVisible: true}), Em.Object.create({isHiddenByFilter: true, isVisible: true})]}),
+ App.SubSection.createRecord({configs: [Em.Object.create({isHiddenByFilter: true, isVisible: true}), Em.Object.create({isHiddenByFilter: true, isVisible: true})]})
],
m: 'all subsections are hidden',
e: true
http://git-wip-us.apache.org/repos/asf/ambari/blob/e593c5ae/ambari-web/test/models/configs/sub_section_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/configs/sub_section_test.js b/ambari-web/test/models/configs/sub_section_test.js
index cf394e5..1e1e356 100644
--- a/ambari-web/test/models/configs/sub_section_test.js
+++ b/ambari-web/test/models/configs/sub_section_test.js
@@ -62,17 +62,22 @@ describe('App.SubSection', function () {
m: 'Can\'t be hidden if there is no configs'
},
{
- configs: [{isHiddenByFilter: true}, {isHiddenByFilter: true}],
+ configs: [Em.Object.create({isHiddenByFilter: true, isVisible: true}), Em.Object.create({isHiddenByFilter: true, isVisible: true})],
e: true,
m: 'All configs are hidden'
},
{
- configs: [{isHiddenByFilter: false}, {isHiddenByFilter: true}],
+ configs: [Em.Object.create({isHiddenByFilter: false, isVisible: true}), Em.Object.create({isHiddenByFilter: true, isVisible: true})],
e: false,
m: 'Some configs are hidden'
},
{
- configs: [{isHiddenByFilter: false}, {isHiddenByFilter: false}],
+ configs: [Em.Object.create({isHiddenByFilter: false, isVisible: true}), Em.Object.create({isHiddenByFilter: true, isVisible: true})],
+ e: false,
+ m: 'Some configs are hidden'
+ },
+ {
+ configs: [Em.Object.create({isHiddenByFilter: false, isVisible: true}), Em.Object.create({isHiddenByFilter: false, isVisible: true})],
e: false,
m: 'No configs are hidden'
}