AMBARI-9252 Versions: cannot register version. (Richard Zang via ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/92b05b9b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/92b05b9b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/92b05b9b Branch: refs/heads/trunk Commit: 92b05b9baeb87c58e6c1ef57751336e2e437722f Parents: 11efa2f Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Thu Jan 22 16:57:22 2015 +0200 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Thu Jan 22 16:57:22 2015 +0200 ---------------------------------------------------------------------- .../scripts/controllers/stackVersions/StackVersionsCreateCtrl.js | 4 +--- .../ui/admin-web/app/views/stackVersions/stackVersionPage.html | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/92b05b9b/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 18a5700..f31f4fc 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 @@ -53,15 +53,13 @@ angular.module('ambariAdminConsole') $scope.save = function () { return Stack.validateBaseUrls($scope.skipValidation, $scope.osList, $scope.upgradeStack.selected).then(function (invalidUrls) { if (invalidUrls.length === 0) { - // TODO repoSubversion input out of sync here, could be related to ng-pattern. Need to find out. - if (!$scope.repoSubversion) { $scope.repoSubversion = angular.element('[name="version"]')[0].value; } Stack.addRepo($scope.upgradeStack.selected, $scope.repoSubversion, $scope.osList) .success(function () { var versionName = $scope.upgradeStack.selected.stack_version + '.' + $scope.repoSubversion; var stackName = $scope.upgradeStack.selected.stack_name; Alert.success('Created version ' + '<a href="#/stackVersions/' + stackName + '/' + versionName + '/edit">' - + stackName + versionName + + + stackName + '-' + versionName + '</a>'); $location.path('/stackVersions'); }) http://git-wip-us.apache.org/repos/asf/ambari/blob/92b05b9b/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 11d42f9..1484c14 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 @@ -42,13 +42,13 @@ <label class="control-label col-sm-2 repo-version-label">Version</label> <div class="col-sm-10"> <select class="form-control repo-version-select" - ng-model="upgradeStack.selected" + ng-model="$parent.upgradeStack.selected" ng-options="o as o.displayName for o in upgradeStack.options" ng-change="afterStackVersionChange()"> </select> <span class="bold-dot">.</span> <div class="form-group" ng-class="{'has-error' : repoRegForm.version.$error.pattern}"> - <input class="form-control" name="version" type="text" ng-model="repoSubversion" ng-pattern="subversionPattern" + <input class="form-control" name="version" type="text" ng-model="$parent.repoSubversion" ng-pattern="subversionPattern" placeholder="Version Name" ng-change="updateCurrentVersionInput()" required/> <span class="text-danger" ng-show="repoRegForm.version.$error.pattern">  {{currentVersionInput}} Invalid.