AMBARI-1450. Remove hard-coded stack version. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1448444 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -43,6 +43,8 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-1450. Remove hard-coded stack version. (yusaku)
+
  AMABRI-1458. Externalize strings from views to messages.js. (yusaku)
 
  AMBARI-1437. Update stack version. (yusaku)

ambari-web/app/app.js

@@ -31,6 +31,12 @@ module.exports = Em.Application.create({
   isAdmin : function(){
     var user = this.db && this.db.getUser();
     return user ? user.admin : false;
+  }.property(),
+  /**
+   * return url prefix with number value of version of HDP stack
+   */
+  stackVersionURL:function(){
+    return '/stacks/HDP/version/' + App.defaultStackVersion.replace(/HDP-/g, '');
   }.property()
 });
 

ambari-web/app/controllers/installer.js

@@ -404,7 +404,7 @@ App.InstallerController = App.WizardController.extend({
 
   loadAdvancedConfig: function (serviceName) {
     var self = this;
-    var url = (App.testMode) ? '/data/wizard/stack/hdp/version01/' + serviceName + '.json' : App.apiPrefix + '/stacks/HDP/version/1.2.0/services/' + serviceName; // TODO: get this url from the stack selected by the user in Install Options page
+    var url = (App.testMode) ? '/data/wizard/stack/hdp/version01/' + serviceName + '.json' : App.apiPrefix + App.get('stackVersionURL') + '/services/' + serviceName; // TODO: get this url from the stack selected by the user in Install Options page
     var method = 'GET';
     var serviceComponents;
     $.ajax({

ambari-web/app/controllers/main/host/add_controller.js

@@ -139,7 +139,7 @@ App.AddHostController = App.WizardController.extend({
    */
   loadServicesFromServer: function() {
     var displayOrderConfig = require('data/services');
-    var apiUrl = '/stacks/HDP/version/1.2.0';
+    var apiUrl = App.get('stackVersionURL');
     var apiService = this.loadServiceComponents(displayOrderConfig, apiUrl);
     //
     apiService.forEach(function(item, index){

ambari-web/app/controllers/main/service/add_controller.js

@@ -115,7 +115,7 @@ App.AddServiceController = App.WizardController.extend({
    */
   loadServicesFromServer: function() {
     var displayOrderConfig = require('data/services');
-    var apiUrl = '/stacks/HDP/version/1.2.0';
+    var apiUrl = App.get('stackVersionURL');
     var apiService = this.loadServiceComponents(displayOrderConfig, apiUrl);
     //
     apiService.forEach(function(item, index){
@@ -529,7 +529,7 @@ App.AddServiceController = App.WizardController.extend({
    */
   loadAdvancedConfig: function (serviceName) {
     var self = this;
-    var url = (App.testMode) ? '/data/wizard/stack/hdp/version01/' + serviceName + '.json' : App.apiPrefix + '/stacks/HDP/version/1.2.0/services/' + serviceName; // TODO: get this url from the stack selected by the user in Install Options page
+    var url = (App.testMode) ? '/data/wizard/stack/hdp/version01/' + serviceName + '.json' : App.apiPrefix + App.get('stackVersionURL') +'/services/' + serviceName; // TODO: get this url from the stack selected by the user in Install Options page
     var method = 'GET';
     $.ajax({
       type: method,

ambari-web/app/controllers/wizard.js

@@ -507,7 +507,7 @@ App.WizardController = Em.Controller.extend({
       return;
     }
     var displayOrderConfig = require('data/services');
-    var apiUrl = '/stacks/HDP/version/1.2.0';
+    var apiUrl = App.get('stackVersionURL');
     var apiService = this.loadServiceComponents(displayOrderConfig, apiUrl);
     this.set('content.services', apiService);
     App.db.setService(apiService);