Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard.js?rev=1485469&r1=1485468&r2=1485469&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/controllers/wizard.js (original) +++ incubator/ambari/trunk/ambari-web/app/controllers/wizard.js Wed May 22 22:26:52 2013 @@ -457,7 +457,8 @@ App.WizardController = Em.Controller.ext name: 'wizard.service_components', sender: this, data: { - stackUrl: App.get('stack2VersionURL') + stackUrl: App.get('stack2VersionURL'), + stackVersion: App.currentStackVersion.replace(/HDP(Local)?-/, '') }, success: 'loadServiceComponentsSuccessCallback', error: 'loadServiceComponentsErrorCallback'
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js?rev=1485469&r1=1485468&r2=1485469&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js (original) +++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js Wed May 22 22:26:52 2013 @@ -280,8 +280,9 @@ App.WizardStep3Controller = Em.Controlle App.router.get('installerController').setLowerStepsDisable(3); this.set('isSubmitDisabled', true); } else { - App.router.get('installerController.isStepDisabled').findProperty('step', 1).set('value', false); - App.router.get('installerController.isStepDisabled').findProperty('step', 2).set('value', false); + App.router.get('installerController.isStepDisabled').filter(function(step){ + if(step.step >= 0 && step.step <= 2) return true; + }).setEach('value', false); } }.observes('isInstallInProgress'), Modified: incubator/ambari/trunk/ambari-web/app/utils/ajax.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/ajax.js?rev=1485469&r1=1485468&r2=1485469&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/utils/ajax.js (original) +++ incubator/ambari/trunk/ambari-web/app/utils/ajax.js Wed May 22 22:26:52 2013 @@ -201,7 +201,7 @@ var urls = { }, 'config.advanced': { 'real': '{stack2VersionUrl}/stackServices/{serviceName}/configurations?fields=*', - 'mock': '/data/wizard/stack/hdp/version130/{serviceName}.json', + 'mock': '/data/wizard/stack/hdp/version{stackVersion}/{serviceName}.json', 'format': function (data) { return { async: false @@ -579,7 +579,7 @@ var urls = { }, 'wizard.service_components': { 'real': '{stackUrl}/stackServices?fields=StackServices', - 'mock': '/data/wizard/stack/hdp/version/1.3.0.json', + 'mock': '/data/wizard/stack/hdp/version/{stackVersion}.json', 'format': function (data, opt) { return { async: false Modified: incubator/ambari/trunk/ambari-web/app/utils/config.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/config.js?rev=1485469&r1=1485468&r2=1485469&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/utils/config.js (original) +++ incubator/ambari/trunk/ambari-web/app/utils/config.js Wed May 22 22:26:52 2013 @@ -483,7 +483,8 @@ App.config = Em.Object.create({ sender: this, data: { serviceName: serviceName, - stack2VersionUrl: App.get('stack2VersionURL') + stack2VersionUrl: App.get('stack2VersionURL'), + stackVersion: App.currentStackVersion.replace(/HDP(Local)?-/, '') }, success: 'loadAdvancedConfigSuccess' });
