Repository: ambari Updated Branches: refs/heads/trunk 156ddc1e1 -> 813a124af
AMBARI-4856. Property filter at Config tab works incorrectly. (xiwang via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/813a124a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/813a124a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/813a124a Branch: refs/heads/trunk Commit: 813a124af9a964377ffb87ab11aec12ed4c8ed6d Parents: 156ddc1 Author: Yusaku Sako <[email protected]> Authored: Thu Feb 27 16:25:40 2014 -0800 Committer: Yusaku Sako <[email protected]> Committed: Thu Feb 27 16:25:40 2014 -0800 ---------------------------------------------------------------------- ambari-web/app/messages.js | 2 ++ ambari-web/app/templates/common/configs/service_config.hbs | 2 +- ambari-web/app/views/common/configs/services_config.js | 1 + ambari-web/app/views/common/filter_combo_cleanable.js | 9 +++++++++ 4 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/813a124a/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index c45173b..d1b0872 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1193,6 +1193,8 @@ Em.I18n.translations = { 'services.service.config.configOverride.head':'Config Override', 'services.service.config.configOverride.body':'Cannot override a config that has not been saved yet.', 'services.service.config.exitPopup.body':'You have unsaved changes. Save changes or discard?', + 'services.service.config.propertyFilterPopover.title':'Properties filter', + 'services.service.config.propertyFilterPopover.content':'Enter keywords to filter properties by property name, value, or description.', 'services.add.header':'Add Service Wizard', 'services.reassign.header':'Move Master Wizard', http://git-wip-us.apache.org/repos/asf/ambari/blob/813a124a/ambari-web/app/templates/common/configs/service_config.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs index 4bf74f8..1dcafbf 100644 --- a/ambari-web/app/templates/common/configs/service_config.hbs +++ b/ambari-web/app/templates/common/configs/service_config.hbs @@ -72,7 +72,7 @@ {{/if}} {{/if}} <div class="pull-right"> - {{view App.FilterComboCleanableView filterBinding="view.filter" columnsBinding="view.columns" }} + {{view App.FilterComboCleanableView filterBinding="view.filter" columnsBinding="view.columns" popoverDescriptionBinding="view.propertyFilterPopover"}} </div> </div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/813a124a/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 f3c6f2d..9f4011d 100644 --- a/ambari-web/app/views/common/configs/services_config.js +++ b/ambari-web/app/views/common/configs/services_config.js @@ -34,6 +34,7 @@ App.ServiceConfigView = Em.View.extend({ isRestartMessageCollapsed: false, filter: '', //from template columns: [], //from template + propertyFilterPopover: [Em.I18n.t('services.service.config.propertyFilterPopover.title'), Em.I18n.t('services.service.config.propertyFilterPopover.content')], canEdit: true, // View is editable or read-only? supportsHostOverrides: function () { switch (this.get('controller.name')) { http://git-wip-us.apache.org/repos/asf/ambari/blob/813a124a/ambari-web/app/views/common/filter_combo_cleanable.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/filter_combo_cleanable.js b/ambari-web/app/views/common/filter_combo_cleanable.js index a002a1b..9ba00cc 100644 --- a/ambari-web/app/views/common/filter_combo_cleanable.js +++ b/ambari-web/app/views/common/filter_combo_cleanable.js @@ -28,6 +28,15 @@ App.FilterComboCleanableView = Ember.View.extend({ classNames: ['filter-combobox', 'input-append'], + didInsertElement: function() { + App.popover(this.$("input[type=text]"), { + title: this.get('popoverDescription')[0], + content: this.get('popoverDescription')[1], + placement: 'bottom', + trigger: 'hover' + }); + }, + placeHolder: function(){ return this.t('common.combobox.placeholder'); }.property(),
