ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srima...@apache.org
Subject ambari git commit: AMBARI-10616. Enhanced config hover should always show atleast property-name and display-name (Richard Zang via srimanth)
Date Tue, 21 Apr 2015 04:29:39 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 7a4242166 -> 4063af87c


AMBARI-10616. Enhanced config hover should always show atleast property-name and display-name
(Richard Zang via srimanth)


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

Branch: refs/heads/trunk
Commit: 4063af87c2010ff905329df254f8ec92b1996be0
Parents: 7a42421
Author: Srimanth Gunturi <sgunturi@hortonworks.com>
Authored: Mon Apr 20 21:29:18 2015 -0700
Committer: Srimanth Gunturi <sgunturi@hortonworks.com>
Committed: Mon Apr 20 21:29:18 2015 -0700

----------------------------------------------------------------------
 .../app/mixins/main/service/configs/widget_popover_support.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4063af87/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/main/service/configs/widget_popover_support.js b/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
index 6bc2016..09f60cb 100644
--- a/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
+++ b/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
@@ -48,11 +48,11 @@ App.WidgetPopoverSupport = Em.Mixin.create({
 
   initPopover: function () {
     // if description for this config not exist, then no need to show popover
-    if (this.get('isPopoverEnabled') !== 'false' && this.get('config.description'))
{
+    if (this.get('isPopoverEnabled') !== 'false') {
       App.popover(this.$('.original-widget'), {
         title: Em.I18n.t('installer.controls.serviceConfigPopover.title').format(
           this.get('configLabel'),
-          (this.get('config.displayName') == this.get('config.name')) ? '' : this.get('config.name')
+          (this.get('config.configLabel') == this.get('config.name')) ? '' : this.get('config.name')
         ),
         content: this.get('config.description'),
         placement: this.get('popoverPlacement'),


Mime
View raw message