Sfoglia il codice sorgente

AMBARI-15750. [Ambari Web] "Install Packages" option not shown when a new version is registered. (xiwang via yusaku)

Yusaku Sako 9 anni fa
parent
commit
aabc4d7236

+ 1 - 1
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'),
 
   /**

+ 2 - 2
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) {

+ 1 - 1
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/*');
     });
   });