Просмотр исходного кода

AMBARI-7584. Slider View: Show yarn-site and global configs in app configs page. (Max Shepel via akovalenko)

Aleksandr Kovalenko 10 лет назад
Родитель
Сommit
ec0034df78

+ 0 - 3
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}
    */

+ 15 - 17
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>

+ 2 - 5
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])
         }));
       }
     });