You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2014/10/01 17:39:46 UTC
[1/2] git commit: AMBARI-7584. Slider View: Show yarn-site and global
configs in app configs page (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 33f3e9952 -> c2a8c66e4
AMBARI-7584. Slider View: Show yarn-site and global configs in app configs page (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2a8c66e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2a8c66e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2a8c66e
Branch: refs/heads/trunk
Commit: c2a8c66e495d9c714733e8ccff819f0d774d7850
Parents: 34858c8
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Wed Oct 1 08:38:39 2014 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Wed Oct 1 08:38:45 2014 -0700
----------------------------------------------------------------------
.../views/slider/src/main/resources/ui/app/models/slider_app.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2a8c66e/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js b/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js
index 332de92..3702b35 100644
--- a/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js
+++ b/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js
@@ -112,7 +112,7 @@ App.SliderApp = DS.Model.extend({
supportedMetricNames: DS.attr('string'),
// Config categories, that should be hidden on app page
- hiddenCategories: ['yarn-site', 'global'],
+ hiddenCategories: [],
/**
* @type {boolean}
[2/2] git commit: Revert "AMBARI-7584. Slider View: Show yarn-site
and global configs in app configs page. (Max Shepel via akovalenko)"
Posted by sr...@apache.org.
Revert "AMBARI-7584. Slider View: Show yarn-site and global configs in app configs page. (Max Shepel via akovalenko)"
This reverts commit ec0034df789179576cd7e2e3e45b41c5b3243c13.
Reverted because, we might want to hide categories in future. We just
dont want to hide global and yarn-site for now
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34858c8b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34858c8b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34858c8b
Branch: refs/heads/trunk
Commit: 34858c8bd585c48d45cee7eb5b290a44a53c0d9f
Parents: 33f3e99
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Wed Oct 1 08:33:04 2014 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Wed Oct 1 08:38:45 2014 -0700
----------------------------------------------------------------------
.../main/resources/ui/app/models/slider_app.js | 3 ++
.../ui/app/templates/slider_app/configs.hbs | 32 +++++++++++---------
.../ui/app/views/slider_app/configs_view.js | 7 +++--
3 files changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/34858c8b/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js b/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js
index 2b7a384..332de92 100644
--- a/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js
+++ b/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js
@@ -111,6 +111,9 @@ App.SliderApp = DS.Model.extend({
supportedMetricNames: DS.attr('string'),
+ // Config categories, that should be hidden on app page
+ hiddenCategories: ['yarn-site', 'global'],
+
/**
* @type {boolean}
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/34858c8b/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
index ab59a54..f073a8d 100644
--- a/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
+++ b/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
@@ -18,21 +18,23 @@
<div class="app_configs">
{{#each configCategory in view.configsByCategories}}
- {{#bs-panel heading=configCategory.name collapsible=true}}
- <div class="container-fluid">
- {{#each configCategory.configs}}
- <div class="row">
- <div class="col-md-3 property-name">{{formatWordBreak key devider="."}}</div>
- <div>
- {{#if isMultiline}}
- {{textarea disabled=true value=value classNames="col-md-6"}}
- {{else}}
- <input type="text" {{bind-attr value=value}} disabled="disabled" class="col-md-6" />
- {{/if}}
+ {{#if configCategory.isVisible}}
+ {{#bs-panel heading=configCategory.name collapsible=true}}
+ <div class="container-fluid">
+ {{#each configCategory.configs}}
+ <div class="row">
+ <div class="col-md-3 property-name">{{formatWordBreak key devider="."}}</div>
+ <div>
+ {{#if isMultiline}}
+ {{textarea disabled=true value=value classNames="col-md-6"}}
+ {{else}}
+ <input type="text" {{bind-attr value=value}} disabled="disabled" class="col-md-6" />
+ {{/if}}
+ </div>
</div>
- </div>
- {{/each}}
- </div>
- {{/bs-panel}}
+ {{/each}}
+ </div>
+ {{/bs-panel}}
+ {{/if}}
{{/each}}
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/34858c8b/contrib/views/slider/src/main/resources/ui/app/views/slider_app/configs_view.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/views/slider_app/configs_view.js b/contrib/views/slider/src/main/resources/ui/app/views/slider_app/configs_view.js
index f2af44d..5093fb9 100644
--- a/contrib/views/slider/src/main/resources/ui/app/views/slider_app/configs_view.js
+++ b/contrib/views/slider/src/main/resources/ui/app/views/slider_app/configs_view.js
@@ -32,16 +32,19 @@ App.SliderAppConfigsView = Ember.View.extend(App.WithPanels, {
configsObserver: function() {
var model = this.get('controller.content'),
configs = model.get('.configs'),
- configsByCategories = this.get('configsByCategories');
+ configsByCategories = this.get('configsByCategories'),
+ hiddenCategories = model.get('hiddenCategories');
Em.keys(configs).forEach(function (site) {
if (configsByCategories.mapBy('name').contains(site)) {
var c = configsByCategories.findBy('name', site);
c.set('configs', model.mapObject(configs[site]));
+ c.set('isVisible', !hiddenCategories.contains(site));
}
else {
configsByCategories.pushObject(Em.Object.create({
name: site,
- configs: model.mapObject(configs[site])
+ configs: model.mapObject(configs[site]),
+ isVisible: !hiddenCategories.contains(site)
}));
}
});