ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-8246. Service Config page: config banner breaks when trying to add an override (onechiporenko)
Date Mon, 10 Nov 2014 12:33:22 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 cb6ad020c -> 75a1e3534


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/75a1e353
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/75a1e353
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/75a1e353

Branch: refs/heads/branch-1.7.0
Commit: 75a1e3534359883338b47e5866e11242054a4ebf
Parents: cb6ad02
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Mon Nov 10 14:09:59 2014 +0200
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Mon Nov 10 14:33:01 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/75a1e353/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>&nbsp;{{t
dashboard.configHistory.info-bar.authoredOn}}&nbsp;<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/75a1e353/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);
             }
           });
         }


Mime
View raw message