Repository: ambari Updated Branches: refs/heads/trunk 4f1607bb0 -> f5b17aa50
AMBARI-10560 When widget error messages show up, widget sizes should not increase. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f5b17aa5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f5b17aa5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f5b17aa5 Branch: refs/heads/trunk Commit: f5b17aa50e6ad73130c130fbab803d96f4aec342 Parents: 4f1607b Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Fri Apr 17 14:15:16 2015 +0300 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Fri Apr 17 14:30:22 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/mixins/common/configs/enhanced_configs.js | 2 +- ambari-web/app/styles/widgets.less | 1 + ambari-web/app/templates/common/configs/widgets/controls.hbs | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f5b17aa5/ambari-web/app/mixins/common/configs/enhanced_configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js index ae6ceee..6349fbf 100644 --- a/ambari-web/app/mixins/common/configs/enhanced_configs.js +++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js @@ -274,7 +274,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({ /** setting dependent serviceNames (without current serviceName) **/ var dependentProperty = App.StackConfigProperty.find(dependent.name + "_" + tag); if (dependentProperty) { - if (!this.get('dependentServiceNames').contains(dependentProperty.get('serviceName')) && dependentProperty.get('serviceName') !== this.get('content.serviceName')) { + if (dependentProperty.get('serviceName') && !this.get('dependentServiceNames').contains(dependentProperty.get('serviceName')) && dependentProperty.get('serviceName') !== this.get('content.serviceName')) { this.get('dependentServiceNames').push(dependentProperty.get('serviceName')); } this._setDependentServicesAndFileNames(dependentProperty); http://git-wip-us.apache.org/repos/asf/ambari/blob/f5b17aa5/ambari-web/app/styles/widgets.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/widgets.less b/ambari-web/app/styles/widgets.less index c052bd2..4c0706e 100644 --- a/ambari-web/app/styles/widgets.less +++ b/ambari-web/app/styles/widgets.less @@ -55,6 +55,7 @@ margin-right: @undo-btn-margin; } .widget-config-controls { + float: right; display: inline-block; margin-left: 10px; .widget-action { http://git-wip-us.apache.org/repos/asf/ambari/blob/f5b17aa5/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 3889ecc..1780906 100644 --- a/ambari-web/app/templates/common/configs/widgets/controls.hbs +++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs @@ -68,6 +68,8 @@ {{#if view.config.errorMessage}} <p class="text-error">{{view.config.errorMessage}}</p> + {{else}} + <p> </p> {{/if}} {{#if view.isComparison}}