ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-22566. Upgrade Angular for Ambari Admin View (alexantonenko)
Date Thu, 30 Nov 2017 21:02:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 47ae2f8e0 -> 41329e3b7


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/41329e3b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/41329e3b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/41329e3b

Branch: refs/heads/branch-2.6
Commit: 41329e3b71b49ab9036228a8a9c794bff720cf7a
Parents: 47ae2f8
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Thu Nov 30 23:02:32 2017 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Thu Nov 30 23:02:32 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/41329e3b/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 78e538d..4a4571a 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
@@ -60,7 +60,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/41329e3b/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 b7fa741..b1c0b54 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/41329e3b/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 dbdf005..df4c434 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.1.1",
-    "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/41329e3b/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 efcd9d4..df3c214 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/package.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/package.json
@@ -12,7 +12,7 @@
     "gulp-filter": "0.4.1",
     "gulp-flatten": "0.0.2",
     "gulp-load-plugins": "0.5.0",
-    "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",


Mime
View raw message