You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2016/04/07 18:13:04 UTC
ambari git commit: AMBARI-15750. [Ambari Web] "Install Packages"
option not shown when a new version is registered. (xiwang via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk 1c737d3a2 -> aabc4d723
AMBARI-15750. [Ambari Web] "Install Packages" option not shown when a new version is registered. (xiwang via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aabc4d72
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aabc4d72
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aabc4d72
Branch: refs/heads/trunk
Commit: aabc4d7236e5a180ae58f5bc947cb1d356306d7f
Parents: 1c737d3
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Apr 7 09:12:40 2016 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Apr 7 09:12:40 2016 -0700
----------------------------------------------------------------------
.../app/controllers/main/admin/stack_and_upgrade_controller.js | 2 +-
ambari-web/app/mappers/repository_version_mapper.js | 4 ++--
.../controllers/main/admin/stack_and_upgrade_controller_test.js | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/aabc4d72/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 17140b4..a056d3b 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -216,7 +216,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
*/
realRepoUrl: function () {
return App.get('apiPrefix') + App.get('stackVersionURL') +
- '/repository_versions?fields=*,RepositoryVersions/*,operating_systems/*,operating_systems/repositories/*';
+ '/compatible_repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*';
}.property('App.stackVersionURL'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/aabc4d72/ambari-web/app/mappers/repository_version_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/repository_version_mapper.js b/ambari-web/app/mappers/repository_version_mapper.js
index f096976..67cfe64 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -24,7 +24,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
modelServices: App.ServiceSimple,
modelRepoVersion: function (isCurrentStackOnly) {
- var repoVersionsKey = 'RepositoryVersions';
+ var repoVersionsKey = isCurrentStackOnly ? 'RepositoryVersions' : 'CompatibleRepositoryVersions';
return {
id: repoVersionsKey + '.id',
stack_version_id: repoVersionsKey + '.stackVersionId',
@@ -91,7 +91,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
var resultOS = [];
var resultRepo = [];
var resultService = [];
- var repoVersionsKey = 'RepositoryVersions';
+ var repoVersionsKey = isCurrentStackOnly ? 'RepositoryVersions' : 'CompatibleRepositoryVersions';
if (json && json.items) {
json.items.forEach(function (item) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/aabc4d72/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index 83bae82..00d7ce8 100644
--- a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -49,7 +49,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
});
it("should be valid", function() {
controller.propertyDidChange('realRepoUrl');
- expect(controller.get('realRepoUrl')).to.equal('apiPrefixstackVersionURL/repository_versions?fields=*,RepositoryVersions/*,operating_systems/*,operating_systems/repositories/*');
+ expect(controller.get('realRepoUrl')).to.equal('apiPrefixstackVersionURL/compatible_repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*');
});
});