Repository: ambari Updated Branches: refs/heads/trunk b5c907032 -> 20e67bcd6
AMBARI-9124 Compare Scheduler changes show no content for comparision version. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/20e67bcd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/20e67bcd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/20e67bcd Branch: refs/heads/trunk Commit: 20e67bcd62cd5a3cce2d459d777719361bb5b6d9 Parents: b5c9070 Author: Andrii Tkach <[email protected]> Authored: Wed Jan 14 18:08:08 2015 +0200 Committer: Andrii Tkach <[email protected]> Committed: Wed Jan 14 18:40:43 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/views/wizard/controls_view.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/20e67bcd/ambari-web/app/views/wizard/controls_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/controls_view.js b/ambari-web/app/views/wizard/controls_view.js index 492d7e9..460d5f2 100644 --- a/ambari-web/app/views/wizard/controls_view.js +++ b/ambari-web/app/views/wizard/controls_view.js @@ -59,15 +59,19 @@ App.ServiceConfigPopoverSupport = Ember.Mixin.create({ }.property('serviceConfig.isEditable') }); +/** + * mixin set class that serve as unique element identificator, + * id not used in order to avoid collision with ember ids + */ App.ServiceConfigCalculateId = Ember.Mixin.create({ - - elementId: Ember.computed(function(){ + 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'; - return 'service-config-' + label + '-' + fileName + '-' + group; - }) - + isOrigin = Em.get(this, 'serviceConfig.compareConfigs.length') > 0 ? '-origin' : ''; + return 'service-config-' + label + '-' + fileName + '-' + group + isOrigin; + }), + classNameBindings: 'idClass' }); /**
