Repository: ambari Updated Branches: refs/heads/trunk 9c74212e7 -> 666b3c690
AMBARI-15775 Integrate Red Hat Satellite option in Ambari Admin (zhewang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/666b3c69 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/666b3c69 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/666b3c69 Branch: refs/heads/trunk Commit: 666b3c6909f7f78ac99007f2626e62d3d05ac269 Parents: 9c74212 Author: Zhe (Joe) Wang <[email protected]> Authored: Fri Apr 8 13:50:38 2016 -0700 Committer: Zhe (Joe) Wang <[email protected]> Committed: Fri Apr 8 13:51:56 2016 -0700 ---------------------------------------------------------------------- .../scripts/controllers/stackVersions/StackVersionsCreateCtrl.js | 1 + .../scripts/controllers/stackVersions/StackVersionsEditCtrl.js | 2 ++ .../src/main/resources/ui/admin-web/app/scripts/services/Stack.js | 3 +++ .../ui/admin-web/app/views/stackVersions/stackVersionPage.html | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/666b3c69/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js index 6feeeac..5596a7f 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js @@ -221,6 +221,7 @@ angular.module('ambariAdminConsole') var updateRepoUrl = false; angular.forEach($scope.osList, function (os) { var savedUrls = $scope.defaulfOSRepos[os.OperatingSystems.os_type]; + os.OperatingSystems.ambari_managed_repositories = !$scope.useRedhatSatellite; if (os.selected) { var currentRepos = os.repositories; if (!savedUrls || currentRepos[0].Repositories.base_url != savedUrls.defaultBaseUrl http://git-wip-us.apache.org/repos/asf/ambari/blob/666b3c69/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js index c209fcc..3da088b 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js @@ -42,6 +42,7 @@ angular.module('ambariAdminConsole') $scope.displayName = response.displayName || $t('common.NA'); $scope.version = response.version || $t('common.NA'); $scope.actualVersion = response.actualVersion || $t('common.NA'); + $scope.useRedhatSatellite = !response.ambari_managed_repositories; $scope.updateObj = response.updateObj; $scope.upgradeStack = { stack_name: response.stackName, @@ -134,6 +135,7 @@ angular.module('ambariAdminConsole') var updateRepoUrl = false; angular.forEach($scope.osList, function (os) { var savedUrls = $scope.defaulfOSRepos[os.OperatingSystems.os_type]; + os.OperatingSystems.ambari_managed_repositories = !$scope.useRedhatSatellite; if (os.selected) { var currentRepos = os.repositories; if (!savedUrls || currentRepos[0].Repositories.base_url != savedUrls.defaultBaseUrl http://git-wip-us.apache.org/repos/asf/ambari/blob/666b3c69/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 4ba0fc1..fd3a8ba 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 @@ -150,6 +150,7 @@ angular.module('ambariAdminConsole') // get repo by stack version(2.3) and id (112) var url = Settings.baseUrl + '/stacks/' + stack_name + '/versions?' + 'fields=repository_versions/operating_systems/repositories/*' + + ',repository_versions/operating_systems/OperatingSystems/*' + ',repository_versions/RepositoryVersions/*' + '&repository_versions/RepositoryVersions/id=' + repoVersion + '&Versions/stack_version=' + stack_version; @@ -157,6 +158,7 @@ angular.module('ambariAdminConsole') // get repo by repoVersion (2.3.6.0-2345) var url = Settings.baseUrl + '/stacks/' + stack_name + '/versions?' + 'fields=repository_versions/operating_systems/repositories/*' + + ',repository_versions/operating_systems/OperatingSystems/*' + ',repository_versions/RepositoryVersions/*' + '&repository_versions/RepositoryVersions/repository_version=' + repoVersion; } @@ -176,6 +178,7 @@ angular.module('ambariAdminConsole') displayName: data.repository_versions[0].RepositoryVersions.release ? data.Versions.stack_name + '-' + data.repository_versions[0].RepositoryVersions.release.version : data.Versions.stack_name + '-' + data.repository_versions[0].RepositoryVersions.repository_version.split('-')[0], //HDP-2.3.4.0 repoVersionFullName : data.Versions.stack_name + '-' + data.repository_versions[0].RepositoryVersions.repository_version, + ambari_managed_repositories: data.repository_versions[0].operating_systems[0].OperatingSystems.ambari_managed_repositories !== false, osList: data.repository_versions[0].operating_systems, updateObj: data.repository_versions[0] }; http://git-wip-us.apache.org/repos/asf/ambari/blob/666b3c69/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html index 39fabf6..8e9d3e2 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html @@ -179,7 +179,7 @@ </label> </div> </div> - <div class="col-sm-12 hidden" id="use-redhat"> + <div class="col-sm-12" id="use-redhat"> <div class="checkbox"> <label> <input type="checkbox" ng-model="useRedhatSatellite" ng-change="clearErrors()">
