Browse Source

AMBARI-10766. New configs layout : autogenerated xPathes are not readable (onechiporenko)

Oleg Nechiporenko 10 years ago
parent
commit
7634801347

+ 1 - 1
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}}

+ 1 - 1
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}

+ 5 - 4
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'