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-feature-AMBARI-14714-blueprintv2 Commit: f43277ebbe6e675c842be00ff318c966901d4a6f Parents: 58868f7 Author: Alex Antonenko <[email protected]> Authored: Thu Nov 30 23:03:22 2017 +0200 Committer: Alex Antonenko <[email protected]> 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",
