瀏覽代碼

AMBARI-9252 Versions: cannot register version. (Richard Zang via ababiichuk)

aBabiichuk 10 年之前
父節點
當前提交
92b05b9bae

+ 1 - 3
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');
           })

+ 2 - 2
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">
               &nbsp{{currentVersionInput}} Invalid.