ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject git commit: AMBARI-3765 Create property filtering capability for config-groups. (atkach)
Date Thu, 14 Nov 2013 15:50:15 GMT
Updated Branches:
  refs/heads/trunk ae1517672 -> a948d6b77


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


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

Branch: refs/heads/trunk
Commit: a948d6b77b798567e40e0a939cfb65aa2cc0ea0a
Parents: ae15176
Author: atkach <andrey91.07@gmail.com>
Authored: Thu Nov 14 17:50:10 2013 +0200
Committer: atkach <andrey91.07@gmail.com>
Committed: Thu Nov 14 17:50:10 2013 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/main/service/info/configs.js |  4 ++--
 ambari-web/app/messages.js                              |  4 ++--
 ambari-web/app/views/common/configs/services_config.js  | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a948d6b7/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 1cf098a..8d1bbb5 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/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

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a948d6b7/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 3649a58..ead756f 100644
--- a/ambari-web/app/messages.js
+++ b/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',
 

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a948d6b7/ambari-web/app/views/common/configs/services_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/services_config.js b/ambari-web/app/views/common/configs/services_config.js
index 748c51e..5f2d22a 100644
--- a/ambari-web/app/views/common/configs/services_config.js
+++ b/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;
       }
 


Mime
View raw message