You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mr...@apache.org on 2017/09/11 04:39:24 UTC
[54/94] [abbrv] ambari git commit: AMBARI-21888. Upgrade History
Should Show Advertised Versions (alexantonenko)
AMBARI-21888. Upgrade History Should Show Advertised Versions (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1f4d2e6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1f4d2e6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1f4d2e6
Branch: refs/heads/branch-feature-AMBARI-14714
Commit: e1f4d2e658d64dbdfc185dc8bdf33675289e2c1b
Parents: 0034da6
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Wed Sep 6 13:06:05 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Wed Sep 6 13:06:05 2017 +0300
----------------------------------------------------------------------
ambari-web/app/styles/stack_versions.less | 2 +-
.../templates/main/admin/stack_upgrade/upgrade_history.hbs | 2 +-
.../views/main/admin/stack_upgrade/upgrade_history_view.js | 9 ++++-----
.../main/admin/stack_upgrade/upgrade_history_view_test.js | 8 +++++---
4 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f4d2e6/ambari-web/app/styles/stack_versions.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/stack_versions.less b/ambari-web/app/styles/stack_versions.less
index 5914348..92843fa 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -772,7 +772,7 @@
cursor: pointer;
}
.accordion-body {
- min-width: 350px;
+ min-width: 400px;
.accordion-inner{
padding-top:10px;
.label{
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f4d2e6/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
index 1287a82..bcf4761 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
@@ -86,7 +86,7 @@
{{service.fromVersion}}
</span>
</div>
- <div class="col-xs-2">
+ <div class="col-xs-2 align-center">
<i class="icon-arrow-right"></i>
</div>
<div class="col-xs-3">
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f4d2e6/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
index 252e7b0..320ceef 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
@@ -149,13 +149,12 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
getRepoServicesForDisplay: function(versions) {
return Object.keys(versions).map(function(serviceName) {
- var fromVersion = App.RepositoryVersion.find(versions[serviceName].from_repository_id);
- var toVersion = App.RepositoryVersion.find(versions[serviceName].to_repository_id);
+ var displayName = App.RepositoryVersion.find(versions[serviceName].from_repository_id).get('stackServices').findProperty('name', serviceName).get('displayName');
return {
name: serviceName,
- displayName: fromVersion.get('stackServices').findProperty('name', serviceName).get('displayName'),
- fromVersion: fromVersion.get('stackServices').findProperty('name', serviceName).get('latestVersion'),
- toVersion: toVersion.get('stackServices').findProperty('name', serviceName).get('latestVersion')
+ displayName: displayName,
+ fromVersion: versions[serviceName].from_repository_version,
+ toVersion: versions[serviceName].to_repository_version
}
});
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f4d2e6/ambari-web/test/views/main/admin/stack_upgrade/upgrade_history_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_history_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_history_view_test.js
index 0de24f9..7fd7130 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_history_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_history_view_test.js
@@ -293,15 +293,17 @@ describe('App.MainAdminStackUpgradeHistoryView', function () {
var versions = {
S1: {
from_repository_id: 1,
- to_repository_id: 2
+ to_repository_id: 2,
+ from_repository_version: '1.123.123-1',
+ to_repository_version: '1.123.123-2'
}
};
expect(view.getRepoServicesForDisplay(versions)).to.be.eql([
{
name: 'S1',
displayName: 's1',
- fromVersion: '1.1',
- toVersion: '1.1'
+ fromVersion: '1.123.123-1',
+ toVersion: '1.123.123-2'
}
]);
});