You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2013/09/18 16:58:39 UTC

[2/2] git commit: AMBARI-3268. The help bubbles for conf. parameters on "Customize Services" page have confusing info. (onechiporenko)

AMBARI-3268. The help bubbles for conf. parameters on "Customize Services" page have confusing info. (onechiporenko)


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

Branch: refs/heads/trunk
Commit: 0d447291714b39316a2d8e250c03765d73b9eb39
Parents: f061d45
Author: Oleg Nechiporenko <cv...@yahoo.com>
Authored: Wed Sep 18 17:54:41 2013 +0300
Committer: Oleg Nechiporenko <cv...@yahoo.com>
Committed: Wed Sep 18 17:58:29 2013 +0300

----------------------------------------------------------------------
 ambari-web/app/views/wizard/controls_view.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0d447291/ambari-web/app/views/wizard/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/controls_view.js b/ambari-web/app/views/wizard/controls_view.js
index 975744f..ad48cfb 100644
--- a/ambari-web/app/views/wizard/controls_view.js
+++ b/ambari-web/app/views/wizard/controls_view.js
@@ -34,7 +34,10 @@ App.ServiceConfigPopoverSupport = Ember.Mixin.create({
   didInsertElement: function () {
     if (this.get('isPopoverEnabled') !== 'false') {
       App.popover(this.$(), {
-        title: Em.I18n.t('installer.controls.serviceConfigPopover.title').format(this.get('serviceConfig.displayName'), this.get('serviceConfig.name')),
+        title: Em.I18n.t('installer.controls.serviceConfigPopover.title').format(
+          this.get('serviceConfig.displayName'),
+          (this.get('serviceConfig.displayName') == this.get('serviceConfig.name'))?'':this.get('serviceConfig.name')
+        ),
         content: this.get('serviceConfig.description'),
         placement: 'right',
         trigger: 'hover'