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 74E59200D60 for ; Fri, 1 Dec 2017 19:10:22 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 73C60160C19; Fri, 1 Dec 2017 18:10: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 B94F3160C06 for ; Fri, 1 Dec 2017 19:10:20 +0100 (CET) Received: (qmail 14510 invoked by uid 500); 1 Dec 2017 18:10:18 -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 14100 invoked by uid 99); 1 Dec 2017 18:10:17 -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; Fri, 01 Dec 2017 18:10:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 41402F60CB; Fri, 1 Dec 2017 18:10:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: avijayan@apache.org To: commits@ambari.apache.org Date: Fri, 01 Dec 2017 18:10:56 -0000 Message-Id: <95e76ad7ccfe4817ac5c3f01553b8932@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [41/50] [abbrv] ambari git commit: AMBARI-22566. Upgrade Angular for Ambari Admin View (alexantonenko) archived-at: Fri, 01 Dec 2017 18:10:22 -0000 AMBARI-22566. Upgrade Angular for Ambari Admin View (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f43277eb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f43277eb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f43277eb Branch: refs/heads/branch-3.0-ams Commit: f43277ebbe6e675c842be00ff318c966901d4a6f Parents: 58868f7 Author: Alex Antonenko Authored: Thu Nov 30 23:03:22 2017 +0200 Committer: Alex Antonenko Committed: Thu Nov 30 23:03:22 2017 +0200 ---------------------------------------------------------------------- .../src/main/resources/ui/admin-web/app/scripts/app.js | 2 +- .../controllers/stackVersions/StackVersionsEditCtrl.js | 2 +- ambari-admin/src/main/resources/ui/admin-web/bower.json | 8 ++++---- ambari-admin/src/main/resources/ui/admin-web/package.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f43277eb/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js index 225eb12..98b0383 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js @@ -63,7 +63,7 @@ angular.module('ambariAdminConsole', [ }; }]); - $httpProvider.responseInterceptors.push(['$rootScope', '$q', function (scope, $q) { + $httpProvider.interceptors.push(['$rootScope', '$q', function (scope, $q) { function success(response) { return response; } http://git-wip-us.apache.org/repos/asf/ambari/blob/f43277eb/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 542772e..a4b121c 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 @@ -36,7 +36,7 @@ angular.module('ambariAdminConsole') $scope.isGPLAccepted = false; $scope.isGPLRepo = function (repository) { - return repository.Repositories.tags.indexOf('GPL') >= 0; + return repository.Repositories.tags && repository.Repositories.tags.indexOf('GPL') >= 0; }; $scope.showRepo = function (repository) { http://git-wip-us.apache.org/repos/asf/ambari/blob/f43277eb/ambari-admin/src/main/resources/ui/admin-web/bower.json ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/bower.json b/ambari-admin/src/main/resources/ui/admin-web/bower.json index c38f464..c9e67f0 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/bower.json +++ b/ambari-admin/src/main/resources/ui/admin-web/bower.json @@ -3,18 +3,18 @@ "private": true, "dependencies": { "bootstrap": "3.3.7", - "angular": "1.2.26", - "angular-route": "1.2.26", + "angular": "1.5.11", + "angular-route": "1.5.11", "angular-bootstrap": "0.11.0", "underscore": "1.7.0", "restangular": "1.4.0", "angular-bootstrap-toggle-switch": "0.5.1", - "angular-animate": "1.2.26", + "angular-animate": "1.5.11", "angular-translate": "2.2.0", "font-awesome": "4.2.0" }, "devDependencies": { - "angular-mocks": "1.2.26", + "angular-mocks": "1.5.11", "commonjs": "0.2.0", "chai": "1.8.0", "mocha": "1.14.0", http://git-wip-us.apache.org/repos/asf/ambari/blob/f43277eb/ambari-admin/src/main/resources/ui/admin-web/package.json ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json b/ambari-admin/src/main/resources/ui/admin-web/package.json index b7c514c..ab117ef 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/package.json +++ b/ambari-admin/src/main/resources/ui/admin-web/package.json @@ -14,7 +14,7 @@ "gulp-flatten": "0.0.2", "gulp-load-plugins": "0.5.0", "gulp-order": "1.1.1", - "gulp-plumber": "0.6.6", + "gulp-plumber": "1.1.0", "gulp-size": "0.3.0", "gulp-uglify": "0.2.1", "gulp-useref": "0.4.2",