You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/04/23 04:54:03 UTC
ambari git commit: AMBARI-10640. Hover not showing up for checkbox
widgets in enhanced configs (Richard Zang via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk cc76c39dd -> 4a9e9bd4a
AMBARI-10640. Hover not showing up for checkbox widgets in enhanced configs (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/4a9e9bd4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a9e9bd4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a9e9bd4
Branch: refs/heads/trunk
Commit: 4a9e9bd4ad8fd33ae7bc2af068280ed0d69bbda6
Parents: cc76c39
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Wed Apr 22 19:53:38 2015 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Wed Apr 22 19:53:38 2015 -0700
----------------------------------------------------------------------
.../app/mixins/main/service/configs/widget_popover_support.js | 5 ++---
.../templates/common/configs/widgets/checkbox_config_widget.hbs | 2 +-
.../app/templates/common/configs/widgets/list_config_widget.hbs | 2 +-
.../views/common/configs/widgets/checkbox_config_widget_view.js | 1 +
.../app/views/common/configs/widgets/list_config_widget_view.js | 1 +
5 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a9e9bd4/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 09f60cb..5a1a4cb 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
@@ -47,12 +47,11 @@ App.WidgetPopoverSupport = Em.Mixin.create({
}.property(),
initPopover: function () {
- // if description for this config not exist, then no need to show popover
- if (this.get('isPopoverEnabled') !== 'false') {
+ 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.configLabel') == this.get('config.name')) ? '' : this.get('config.name')
+ (this.get('configLabel') == this.get('config.name')) ? '' : this.get('config.name')
),
content: this.get('config.description'),
placement: this.get('popoverPlacement'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a9e9bd4/ambari-web/app/templates/common/configs/widgets/checkbox_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/checkbox_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/checkbox_config_widget.hbs
index 8c16beb..25cf3fc 100644
--- a/ambari-web/app/templates/common/configs/widgets/checkbox_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/checkbox_config_widget.hbs
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
}}
-<div class="pull-left">
+<div {{bindAttr class=":pull-left view.isOriginalSCP:original-widget"}}>
<label>
{{view view.configView class="pull-left"}}
{{#if view.isOriginalSCP}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a9e9bd4/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
index fe54d7d..43d95d0 100644
--- a/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
@@ -16,7 +16,7 @@
* limitations under the License.
}}
-<div {{bindAttr class="view.config.isHiddenByFilter:hide :widget-config :list-widget"}}>
+<div {{bindAttr class="view.config.isHiddenByFilter:hide view.isOriginalSCP:original-widget :widget-config :list-widget"}}>
{{#if view.isOriginalSCP}}
<p class="widget-config-label">{{view.configLabel}}</p>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a9e9bd4/ambari-web/app/views/common/configs/widgets/checkbox_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/checkbox_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/checkbox_config_widget_view.js
index 7acd382..21c6563 100644
--- a/ambari-web/app/views/common/configs/widgets/checkbox_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/checkbox_config_widget_view.js
@@ -29,6 +29,7 @@ App.CheckboxConfigWidgetView = App.ConfigWidgetView.extend({
didInsertElement: function () {
var self = this;
+ this.initPopover();
this._super(arguments);
Em.run.next(function () {
if (self.$())
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a9e9bd4/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
index 7e38f75..6f412e4 100644
--- a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
@@ -114,6 +114,7 @@ App.ListConfigWidgetView = App.ConfigWidgetView.extend({
},
didInsertElement: function () {
+ this.initPopover();
this._super();
this.addObserver('options.@each.isSelected', this, this.calculateVal);
this.addObserver('options.@each.isSelected', this, this.checkSelectedItemsCount);