ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [44/50] [abbrv] git commit: AMBARI-7584. Slider View: Show yarn-site and global configs in app configs page. (Max Shepel via akovalenko)
Date Wed, 01 Oct 2014 15:27:42 GMT
AMBARI-7584. Slider View: Show yarn-site and global configs in app configs page. (Max Shepel
via akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ec0034df
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ec0034df
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ec0034df

Branch: refs/heads/branch-alerts-dev
Commit: ec0034df789179576cd7e2e3e45b41c5b3243c13
Parents: a172f75
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Wed Oct 1 15:29:09 2014 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Wed Oct 1 15:35:09 2014 +0300

----------------------------------------------------------------------
 .../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, 17 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ec0034df/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..2b7a384 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,9 +111,6 @@ 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/ec0034df/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 f073a8d..ab59a54 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,23 +18,21 @@
 
 <div class="app_configs">
   {{#each configCategory in view.configsByCategories}}
-    {{#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>
+    {{#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>
-          {{/each}}
-        </div>
-      {{/bs-panel}}
-    {{/if}}
+          </div>
+        {{/each}}
+      </div>
+    {{/bs-panel}}
   {{/each}}
 </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/ec0034df/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 5093fb9..f2af44d 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,19 +32,16 @@ App.SliderAppConfigsView = Ember.View.extend(App.WithPanels, {
   configsObserver: function() {
     var model = this.get('controller.content'),
       configs = model.get('.configs'),
-      configsByCategories = this.get('configsByCategories'),
-      hiddenCategories = model.get('hiddenCategories');
+      configsByCategories = this.get('configsByCategories');
     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]),
-          isVisible: !hiddenCategories.contains(site)
+          configs: model.mapObject(configs[site])
         }));
       }
     });


Mime
View raw message