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 2015/04/27 17:22:42 UTC
ambari git commit: AMBARI-10766. New configs layout : autogenerated
xPathes are not readable (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 21d911316 -> 763480134
AMBARI-10766. New configs layout : autogenerated xPathes are not readable (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/76348013
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/76348013
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/76348013
Branch: refs/heads/trunk
Commit: 76348013473e9b4c9ebe2e1bb5ebb5dd9ed07e87
Parents: 21d9113
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Mon Apr 27 18:19:11 2015 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Mon Apr 27 18:22:20 2015 +0300
----------------------------------------------------------------------
.../app/templates/common/configs/widgets/controls.hbs | 2 +-
.../app/views/common/configs/widgets/config_widget_view.js | 2 +-
ambari-web/app/views/common/controls_view.js | 9 +++++----
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/76348013/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 c3b7e88..e2ec89c 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs
@@ -76,7 +76,7 @@
<div class="widget-config-controls">
{{#if controller.selectedConfigGroup.isDefault}}
<span
- class="label label-info pull-right">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span>
+ class="label label-info">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span>
{{#if controller.isCurrentSelected}}
<span class="label label-success">{{t common.current}}</span>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/76348013/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 1251837..86ec19f 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
@@ -22,7 +22,7 @@ require('views/common/controls_view');
* Common view for config widgets
* @type {Em.View}
*/
-App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPopoverSupport, App.ConvertUnitWidgetViewMixin, {
+App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPopoverSupport, App.ConvertUnitWidgetViewMixin, App.ServiceConfigCalculateId, {
/**
* @type {App.ConfigProperty}
http://git-wip-us.apache.org/repos/asf/ambari/blob/76348013/ambari-web/app/views/common/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index e6ce369..4ec1c74 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -132,10 +132,11 @@ App.SupportsDependentConfigs = Ember.Mixin.create({
*/
App.ServiceConfigCalculateId = Ember.Mixin.create({
idClass: Ember.computed(function () {
- var label = Em.get(this, 'serviceConfig.name') ? Em.get(this, 'serviceConfig.name').toLowerCase().replace(/\./g, '-') : '',
- fileName = Em.get(this, 'serviceConfig.filename') ? Em.get(this, 'serviceConfig.filename').toLowerCase().replace(/\./g, '-') : '',
- group = Em.get(this, 'serviceConfig.group.name') || 'default';
- isOrigin = Em.get(this, 'serviceConfig.compareConfigs.length') > 0 ? '-origin' : '';
+ var config = this.get('config') && this.get('config.widget') ? this.get('config') : this.get('serviceConfig') || {};
+ var label = Em.get(config, 'name') ? Em.get(config, 'name').toLowerCase().replace(/\./g, '-') : '',
+ fileName = Em.get(config, 'filename') ? Em.get(config, 'filename').toLowerCase().replace(/\./g, '-') : '',
+ group = Em.get(config, 'group.name') || 'default',
+ isOrigin = Em.getWithDefault(config, 'compareConfigs.length', 0) > 0 ? '-origin' : '';
return 'service-config-' + label + '-' + fileName + '-' + group + isOrigin;
}),
classNameBindings: 'idClass'