Repository: ambari Updated Branches: refs/heads/trunk 684ffd294 -> 2a09dfeeb
AMBARI-11021. 'Set Recommended Value' is active for parent config while override is active (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2a09dfee Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a09dfee Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a09dfee Branch: refs/heads/trunk Commit: 2a09dfeebf271a462a955f25c0ff42618be21462 Parents: 684ffd2 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Fri May 8 14:12:36 2015 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Fri May 8 14:14:50 2015 +0300 ---------------------------------------------------------------------- .../main/service/configs/config_overridable.js | 1 + .../common/configs/service_config_category.hbs | 14 ++++++++------ .../templates/common/configs/widgets/controls.hbs | 12 +++++++----- .../common/configs/widgets/config_widget_view.js | 15 +++++++++++---- 4 files changed, 27 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2a09dfee/ambari-web/app/mixins/main/service/configs/config_overridable.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/main/service/configs/config_overridable.js b/ambari-web/app/mixins/main/service/configs/config_overridable.js index 5012c5b..57910f4 100644 --- a/ambari-web/app/mixins/main/service/configs/config_overridable.js +++ b/ambari-web/app/mixins/main/service/configs/config_overridable.js @@ -30,6 +30,7 @@ App.ConfigOverridable = Em.Mixin.create({ * @method createOverrideProperty */ createOverrideProperty: function (event) { + $('.tooltip').remove(); var serviceConfigProperty = event.contexts[0]; var serviceConfigController = this.get('isView') ? this.get('controller') : this; var selectedConfigGroup = serviceConfigController.get('selectedConfigGroup'); http://git-wip-us.apache.org/repos/asf/ambari/blob/2a09dfee/ambari-web/app/templates/common/configs/service_config_category.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_config_category.hbs b/ambari-web/app/templates/common/configs/service_config_category.hbs index e879871..fbc5c2a 100644 --- a/ambari-web/app/templates/common/configs/service_config_category.hbs +++ b/ambari-web/app/templates/common/configs/service_config_category.hbs @@ -116,12 +116,14 @@ </a> {{/if}} {{/unless}} - {{#if recommendedValueExists}} - <a class="btn btn-small" href="#" data-toggle="tooltip" - {{action "setRecommendedValue" this target="view"}} - {{translateAttr data-original-title="services.service.config.setRecommendedValue"}}> - <i class="icon-repeat"></i> - </a> + {{#if isEditable}} + {{#if recommendedValueExists}} + <a class="btn btn-small" href="#" data-toggle="tooltip" + {{action "setRecommendedValue" this target="view"}} + {{translateAttr data-original-title="services.service.config.setRecommendedValue"}}> + <i class="icon-repeat"></i> + </a> + {{/if}} {{/if}} {{/if}} <span class="help-inline">{{errorMessage}}</span> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a09dfee/ambari-web/app/templates/common/configs/widgets/controls.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs b/ambari-web/app/templates/common/configs/widgets/controls.hbs index b7541c8..7ad07ac 100644 --- a/ambari-web/app/templates/common/configs/widgets/controls.hbs +++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs @@ -42,11 +42,13 @@ data-toggle="tooltip" {{translateAttr data-original-title="config.infoMessage.wrong.value.for.widget"}}></i> {{/if}} {{/if}} - {{#if config.recommendedValueExists}} - <a href="#" - {{bindAttr class=":icon-repeat :widget-action-set-recommended view.isHover::hide :widget-action"}} - {{action "setRecommendedValue" target="view"}} data-toggle="tooltip" {{translateAttr data-original-title="services.service.config.setRecommendedValue"}}> - </a> + {{#if view.config.recommendedValueExists}} + {{#unless view.disabled}} + <a href="#" + {{bindAttr class=":icon-repeat :widget-action-set-recommended view.isHover::hide :widget-action"}} + {{action "setRecommendedValue" target="view"}} data-toggle="tooltip" {{translateAttr data-original-title="services.service.config.setRecommendedValue"}}> + </a> + {{/unless}} {{/if}} </div> <div class="widget-col right"> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a09dfee/ambari-web/app/views/common/configs/widgets/config_widget_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js b/ambari-web/app/views/common/configs/widgets/config_widget_view.js index 7de84a3..c501532 100644 --- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js +++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js @@ -202,11 +202,9 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo /** * Error message computed in config property model - * @type {String|Boolean} + * @type {String} */ - configErrorMessage: function() { - return this.get('config.errorMessage') || false; - }.property('config.errorMessage'), + configErrorMessageBinding: 'config.errorMessage', /** * Determines if config-value was changed @@ -261,11 +259,20 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo return !config.get('cantBeUndone') && config.get('isNotDefaultValue'); }.property('config.cantBeUndone', 'config.isNotDefaultValue', 'isOriginalSCP', 'disabled'), + /** + * Determines if "final"-button should be shown + * @type {boolean} + */ showFinalConfig: function () { var config = this.get('config'); return config.get('isFinal') || (!config.get('isNotEditable') && this.get('isHover')); }.property('config.isFinal', 'config.isNotEditable', 'isHover'), + /** + * + * @param {{context: App.ServiceConfigProperty}} event + * @method toggleFinalFlag + */ toggleFinalFlag: function (event) { var configProperty = event.context; if (configProperty.get('isNotEditable')) {