AMBARI-16908. Different repositories show same versions of services.(xiwang)

ambari-web/app/mappers/repository_version_mapper.js

@@ -121,7 +121,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
           if (item[repoVersionsKey].stack_services) {
             item[repoVersionsKey].stack_services.forEach(function (service) {
               var serviceObj = {
-                id: service.name,
+                id: item[repoVersionsKey].repository_version + service.name,
                 name: service.name,
                 display_name: service.display_name,
                 latest_version: service.versions[0] ? service.versions[0] : ''
@@ -132,7 +132,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
           } else if (item[repoVersionsKey].services) {
             item[repoVersionsKey].services.forEach(function (service) {
               var serviceObj = {
-                id: service.name,
+                id: item[repoVersionsKey].repository_version + service.name,
                 name: service.name,
                 display_name: service.display_name,
                 latest_version: service.versions[0] ? service.versions[0].version: ''

ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs

@@ -34,7 +34,7 @@
       {{bindAttr disabled="view.stateElement.isDisabled"}}>
       {{view.stateElement.text}}
     </button>
- {{/if}}
+  {{/if}}
   {{#if view.stateElement.isButtonGroup}}
     <div class="btn-group">
       <button class="btn btn-primary"

ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs

@@ -58,7 +58,7 @@
   <div class="span10 versions-slides">
     {{#if isLoaded}}
       <div class="versions-slides-bar">
-        {{#each version in view.repoVersions}}
+        {{#each version in view.repoVersionsDisplay}}
           {{#if version.isVisible}}
             {{view App.UpgradeVersionColumnView contentBinding="version"}}
           {{/if}}

ambari-web/app/views/main/admin/stack_upgrade/versions_view.js

@@ -127,6 +127,12 @@ App.MainAdminStackVersionsView = Em.View.extend({
    */
   repoVersions: App.RepositoryVersion.find(),
 
+  repoVersionsDisplay: function () {
+    return this.get('repoVersions').toArray().sort(function (a, b) {
+      return (a.get('repositoryVersion') > b.get('repositoryVersion')) ? 1 : ((b.get('repositoryVersion') > a.get('repositoryVersion')) ? -1 : 0);
+    });
+  }.property('repoVersions'),
+
   /**
    * @type {Em.Array}
    */