Browse Source

AMBARI-4856. Property filter at Config tab works incorrectly. (xiwang via yusaku)

Yusaku Sako 11 years ago
parent
commit
813a124af9

+ 2 - 0
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',

+ 1 - 1
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}}

+ 1 - 0
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')) {

+ 9 - 0
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(),