Repository: ambari Updated Branches: refs/heads/trunk 6f1e47637 -> 771d17e84
AMBARI-8246. Service Config page: config banner breaks when trying to add an override (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/771d17e8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/771d17e8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/771d17e8 Branch: refs/heads/trunk Commit: 771d17e8458476851e1dab401561fbc5f8692a29 Parents: e2fc2da Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Mon Nov 10 14:11:33 2014 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Mon Nov 10 14:32:14 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/templates/common/configs/config_history_flow.hbs | 4 ++++ ambari-web/app/views/common/configs/config_history_flow.js | 1 + 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/771d17e8/ambari-web/app/templates/common/configs/config_history_flow.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/config_history_flow.hbs b/ambari-web/app/templates/common/configs/config_history_flow.hbs index def5820..0ad38aa 100644 --- a/ambari-web/app/templates/common/configs/config_history_flow.hbs +++ b/ambari-web/app/templates/common/configs/config_history_flow.hbs @@ -97,11 +97,15 @@ </ul> </div> <div class="label-wrapper span8" data-toggle="tooltip" {{bindAttr data-original-title="view.displayedServiceVersion.fullNotes"}}> + {{#if view.displayedServiceVersion.versionText}} <span class="label label-info">{{view.displayedServiceVersion.versionText}}</span> + {{/if}} {{#if view.displayedServiceVersion.isCurrent}} <span class="label label-success">{{t common.current}}</span> {{/if}} + {{#if view.displayedServiceVersion.author}} <strong>{{view.displayedServiceVersion.author}}</strong> {{t dashboard.configHistory.info-bar.authoredOn}} <strong>{{view.displayedServiceVersion.createdDate}}</strong> + {{/if}} </div> {{#if App.isManager}} <div class="pull-right operations-button"> http://git-wip-us.apache.org/repos/asf/ambari/blob/771d17e8/ambari-web/app/views/common/configs/config_history_flow.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/config_history_flow.js b/ambari-web/app/views/common/configs/config_history_flow.js index 12b0c51..72fe62b 100644 --- a/ambari-web/app/views/common/configs/config_history_flow.js +++ b/ambari-web/app/views/common/configs/config_history_flow.js @@ -249,6 +249,7 @@ App.ConfigHistoryFlowView = Em.View.extend({ // find current in default group if (serviceVersion.get('isCurrent') && serviceVersion.get('groupName') == Em.I18n.t('dashboard.configHistory.table.configGroup.default')){ currentIndex = index + 1; + serviceVersion.set('isDisplayed', true); } }); }
