瀏覽代碼

AMBARI-3765 Create property filtering capability for config-groups. (atkach)

atkach 11 年之前
父節點
當前提交
a948d6b77b

+ 2 - 2
ambari-web/app/controllers/main/service/info/configs.js

@@ -126,11 +126,11 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
   filter: '',
 
   /**
-   * Dropdown menu items in filter compbobox
+   * Dropdown menu items in filter combobox
    */
   filterColumns: function () {
     var result = [];
-    for (var i = 1; i < 4; i++) {
+    for (var i = 1; i < 2; i++) {
       result.push(Ember.Object.create({
         name: this.t('common.combobox.dropdown.' + i),
         selected: false

+ 2 - 2
ambari-web/app/messages.js

@@ -1670,8 +1670,8 @@ Em.I18n.translations = {
 
   'common.combobox.placeholder': 'Filter...',
   'common.combobox.dropdown.1': 'Overridden properties',
-  'common.combobox.dropdown.2': 'Modified properties',
-  'common.combobox.dropdown.3': 'Properties needing restart',
+  //'common.combobox.dropdown.2': 'Modified properties',
+  //'common.combobox.dropdown.3': 'Properties needing restart',
 
   'quick.links.error.label': 'Hostname is undefined',
 

+ 6 - 6
ambari-web/app/views/common/configs/services_config.js

@@ -289,20 +289,20 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({
    */
   filteredCategoryConfigs: function () {
     var filter = this.get('parentView.filter').toLowerCase();
-    var isOnlyModified = this.get('parentView.columns').length && this.get('parentView.columns')[1].get('selected');
+    //var isOnlyModified = this.get('parentView.columns').length && this.get('parentView.columns')[1].get('selected');
     var isOnlyOverridden = this.get('parentView.columns').length && this.get('parentView.columns')[0].get('selected');
-    var isOnlyRestartRequired = this.get('parentView.columns').length && this.get('parentView.columns')[2].get('selected');
+    //var isOnlyRestartRequired = this.get('parentView.columns').length && this.get('parentView.columns')[2].get('selected');
     var filteredResult = this.get('categoryConfigs').filter(function (config) {
 
-      if (isOnlyModified && !config.get('isNotDefaultValue')) {
+     /* if (isOnlyModified && !config.get('isNotDefaultValue')) {
         return false;
       }
 
-      if (isOnlyOverridden && !config.get('isOverridden')) {
+      if (isOnlyRestartRequired && !config.get('isRestartRequired')) {
         return false;
-      }
+      }*/
 
-      if (isOnlyRestartRequired && !config.get('isRestartRequired')) {
+      if (isOnlyOverridden && !config.get('isOverridden')) {
         return false;
       }