AMBARI-22554. UI should pass repo_name for repository validation (vsubramanian)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ca174fb3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ca174fb3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ca174fb3 Branch: refs/heads/branch-3.0-perf Commit: ca174fb32a0e34582776b0607b6a2d14dc72c20d Parents: 323ce7a Author: Vivek Ratnavel Subramanian <[email protected]> Authored: Wed Nov 29 16:22:20 2017 -0800 Committer: Vivek Ratnavel Subramanian <[email protected]> Committed: Wed Nov 29 16:22:20 2017 -0800 ---------------------------------------------------------------------- .../main/resources/ui/admin-web/app/scripts/services/Stack.js | 3 ++- ambari-web/app/controllers/installer.js | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ca174fb3/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js index 90f4f48..f52e687 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js @@ -405,7 +405,8 @@ angular.module('ambariAdminConsole') $http.post(url + '/operating_systems/' + os.OperatingSystems.os_type + '/repositories/' + repo.Repositories.repo_id + '?validate_only=true', { "Repositories": { - "base_url": repo.Repositories.base_url + "base_url": repo.Repositories.base_url, + "repo_name": repo.Repositories.repo_name } }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/ca174fb3/ambari-web/app/controllers/installer.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js index d6be78d..f49fc11 100644 --- a/ambari-web/app/controllers/installer.js +++ b/ambari-web/app/controllers/installer.js @@ -315,7 +315,9 @@ App.InstallerController = App.WizardController.extend(App.Persist, { App.Repository.find().findProperty('id', repo.id).set('baseUrl', repo.base_url); }); _oses.forEach(function (os) { - App.OperatingSystem.find().findProperty('id', os.id).set('isSelected', os.is_selected); + if (App.OperatingSystem.find().findProperty('id', os.id)) { + App.OperatingSystem.find().findProperty('id', os.id).set('isSelected', os.is_selected); + } }); //should delete the record on going to step 2, on going back to step 1, still need the record if (App.router.get('currentState.name') != "step1") { @@ -863,6 +865,7 @@ App.InstallerController = App.WizardController.extend(App.Persist, { data: { 'Repositories': { 'base_url': repo.get('baseUrl'), + 'repo_name': repo.get('repoName'), "verify_base_url": verifyBaseUrl } }
