Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0F4B0200AF7 for ; Tue, 14 Jun 2016 19:15:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0DDB4160A47; Tue, 14 Jun 2016 17:15:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AC38C160A06 for ; Tue, 14 Jun 2016 19:15:20 +0200 (CEST) Received: (qmail 37732 invoked by uid 500); 14 Jun 2016 17:15:19 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 37723 invoked by uid 99); 14 Jun 2016 17:15:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jun 2016 17:15:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BCB50DFF13; Tue, 14 Jun 2016 17:15:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: zhewang@apache.org To: commits@ambari.apache.org Message-Id: <90f92713eda2438f9a9d42d5f6d092d4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17230 VDF: when registering version using Default Vers Def, need to set Name (zhewang) Date: Tue, 14 Jun 2016 17:15:19 +0000 (UTC) archived-at: Tue, 14 Jun 2016 17:15:22 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.4 5fff807f8 -> 3acccee8e AMBARI-17230 VDF: when registering version using Default Vers Def, need to set Name (zhewang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3acccee8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3acccee8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3acccee8 Branch: refs/heads/branch-2.4 Commit: 3acccee8ed047817b7f5c5bfcc2249b0d579d214 Parents: 5fff807 Author: Zhe (Joe) Wang Authored: Tue Jun 14 10:13:29 2016 -0700 Committer: Zhe (Joe) Wang Committed: Tue Jun 14 10:14:41 2016 -0700 ---------------------------------------------------------------------- .../stackVersions/StackVersionsCreateCtrl.js | 13 +- .../app/scripts/services/AddVersionModal.js | 2 + .../ui/admin-web/app/scripts/services/Stack.js | 6 + .../views/stackVersions/stackVersionPage.html | 345 ++++++++++--------- 4 files changed, 201 insertions(+), 165 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3acccee8/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 cc42abb..6cf6849 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 @@ -315,6 +315,10 @@ angular.module('ambariAdminConsole') var isXMLdata = $scope.isXMLdata; } + if (!isXMLdata) { + data.VersionDefinition.display_name = $scope.activeStackVersion.displayName; + } + var repoUpdate = { operating_systems: $scope.updateObj.operating_systems }; @@ -322,10 +326,9 @@ angular.module('ambariAdminConsole') var versionInfo = response.resources[0].VersionDefinition; if (versionInfo.id && versionInfo.stack_name && versionInfo.stack_version) { Stack.updateRepo(versionInfo.stack_name, versionInfo.stack_version, versionInfo.id, repoUpdate).then(function () { - Alert.success($t('versions.alerts.versionEdited', { + Alert.success($t('versions.alerts.versionCreated', { stackName: $scope.upgradeStack.stack_name, - versionName: $scope.actualVersion, - displayName: $scope.displayName + versionName: $scope.actualVersion })); $location.path('/stackVersions'); }).catch(function (data) { @@ -570,6 +573,10 @@ angular.module('ambariAdminConsole') }); }; + $scope.updateCurrentVersionInput = function () { + $scope.activeStackVersion.displayName = $scope.activeStackVersion.stackNameVersion + "." + angular.element('[name="version"]')[0].value; + }; + $scope.fetchPublicVersions = function () { return Stack.allPublicStackVersions().then(function (versions) { if (versions && versions.length) { http://git-wip-us.apache.org/repos/asf/ambari/blob/3acccee8/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/AddVersionModal.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/AddVersionModal.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/AddVersionModal.js index 26b3558..3345b0b 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/AddVersionModal.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/AddVersionModal.js @@ -113,6 +113,8 @@ angular.module('ambariAdminConsole') version: repo.VersionDefinition.release ? repo.VersionDefinition.release.version: null, /// 2.3.4.0 releaseNotes: repo.VersionDefinition.release ? repo.VersionDefinition.release.release_notes: null, displayName: repo.VersionDefinition.stack_name + '-' + repo.VersionDefinition.repository_version, //HDP-2.3.4.0 + editableDisplayName: repo.VersionDefinition.repository_version.substring(4), + isNonXMLdata: !isXMLdata, repoVersionFullName : repo.VersionDefinition.stack_name + '-' + repo.VersionDefinition.release ? repo.VersionDefinition.release.version: repo.VersionDefinition.repository_version, ambari_managed_repositories: repo.operating_systems[0].OperatingSystems.ambari_managed_repositories !== false, osList: repo.operating_systems, http://git-wip-us.apache.org/repos/asf/ambari/blob/3acccee8/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 7e76859..9b8fdfa 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 @@ -96,12 +96,18 @@ angular.module('ambariAdminConsole') stackNameVersion: version.VersionDefinition.stack_name + '-' + version.VersionDefinition.stack_version, displayName: version.VersionDefinition.stack_name + '-' + version.VersionDefinition.repository_version.split('-')[0], //HDP-2.3.4.0 displayNameFull: version.VersionDefinition.stack_name + '-' + version.VersionDefinition.repository_version, //HDP-2.3.4.0-23 + editableDisplayName: version.VersionDefinition.repository_version.substring(4), + isNonXMLdata: true, repositoryVersion: version.VersionDefinition.repository_version, stackNameRepositoryVersion: version.VersionDefinition.stack_name + '-' + version.VersionDefinition.repository_version, showAvailable: version.VersionDefinition.show_available, osList: version.operating_systems, updateObj: version }; + //hard code to not show stack name box for ECS stack + if (isNaN(versionObj.editableDisplayName.charAt(0))) { + versionObj.isNonXMLdata = false; + } var services = []; angular.forEach(version.VersionDefinition.stack_services, function (service) { // services that should not be shown on UI http://git-wip-us.apache.org/repos/asf/ambari/blob/3acccee8/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 83f54fd..e7bf01d 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 @@ -32,190 +32,211 @@
+
+ 
 +

 + 
 +

 -
 -

 - 
 -

 - -
-
-
-
-

 - - - - - - - - - - - - - -
{{'common.stack' | translate}}{{activeStackVersion.stackNameVersion}}
{{'common.name' | translate}}{{activeStackVersion.displayName}}
{{'common.version' | translate}}{{activeStackVersion.actualVersion}}
-
+
+
+
+
+

 + + + + + + + + + + + + + +
{{'common.stack' | translate}}{{activeStackVersion.stackNameVersion}}
{{'common.name' | translate}}{{activeStackVersion.displayName}}
{{'common.version' | translate}}{{activeStackVersion.actualVersion}}
+
-
-
- - +
+
+ + +
+
+ +
+ + {{activeStackVersion.stackNameVersion}} + + . +
+ +
+
+  {{activeStackVersion.displayName}} Invalid. +
+
+
+
+
+
+ + + + + +
{{service.displayName}}{{service.version}}
-
-
- - - - - -
{{service.displayName}}{{service.version}}
-
-
+
-
- - {{'versions.usePublic' | translate}} - {{'versions.networkIssues.networkLost'| translate}} -
-
- - {{'versions.useLocal' | translate}} +
+ + {{'versions.usePublic' | translate}} + {{'versions.networkIssues.networkLost'| translate}} +
+
+ + {{'versions.useLocal' | translate}} +
-
-
+
- -
-
-

- {{'versions.repos' | translate}} - -

-
-
-
- - -
-
-
-
-
- - + +
+
+

+ {{'versions.repos' | translate}} + +

+
+
+
+ + +
+
+
+
+
+ + +
-
- -
-
-
- -
- -
-
-
- {{repository.Repositories.repo_id}} -
- +
+ +
+
+
+ +
+ +
+
+
+ {{repository.Repositories.repo_id}} +
+ +
+
-
-
-
{{'common.controls.remove' | translate}} +
{{'common.controls.remove' | translate}} +
-
-
-
-
- +
+
+
+ +
-
-
-
- +
+
+ +
-
-
- - -
- +
+ {{versionRegForm.version.$invalid}} +
+
+ + +
+ + \ No newline at end of file