ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vivekratna...@apache.org
Subject [2/2] ambari git commit: Revert "AMBARI-22566. Upgrade Angular for Ambari Admin View (alexantonenko)"
Date Tue, 05 Dec 2017 00:44:39 GMT
Revert "AMBARI-22566. Upgrade Angular for Ambari Admin View (alexantonenko)"

This reverts commit f43277ebbe6e675c842be00ff318c966901d4a6f.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1c9aa9d3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1c9aa9d3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1c9aa9d3

Branch: refs/heads/trunk
Commit: 1c9aa9d32804abce454c82ce4d75bfac87182b49
Parents: 6613d45
Author: Vivek Ratnavel Subramanian <vivekratnavel90@gmail.com>
Authored: Mon Dec 4 16:44:29 2017 -0800
Committer: Vivek Ratnavel Subramanian <vivekratnavel90@gmail.com>
Committed: Mon Dec 4 16:44:29 2017 -0800

----------------------------------------------------------------------
 .../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/1c9aa9d3/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 98b0383..225eb12 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.interceptors.push(['$rootScope', '$q', function (scope, $q) {
+  $httpProvider.responseInterceptors.push(['$rootScope', '$q', function (scope, $q) {
     function success(response) {
       return response;
     }

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9aa9d3/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 a4b121c..542772e 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 && repository.Repositories.tags.indexOf('GPL')
>= 0;
+    return repository.Repositories.tags.indexOf('GPL') >= 0;
   };
 
   $scope.showRepo = function (repository) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9aa9d3/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 c9e67f0..c38f464 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.5.11",
-    "angular-route": "1.5.11",
+    "angular": "1.2.26",
+    "angular-route": "1.2.26",
     "angular-bootstrap": "0.11.0",
     "underscore": "1.7.0",
     "restangular": "1.4.0",
     "angular-bootstrap-toggle-switch": "0.5.1",
-    "angular-animate": "1.5.11",
+    "angular-animate": "1.2.26",
     "angular-translate": "2.2.0",
     "font-awesome": "4.2.0"
   },
   "devDependencies": {
-    "angular-mocks": "1.5.11",
+    "angular-mocks": "1.2.26",
     "commonjs": "0.2.0",
     "chai": "1.8.0",
     "mocha": "1.14.0",

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9aa9d3/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 ab117ef..b7c514c 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": "1.1.0",
+    "gulp-plumber": "0.6.6",
     "gulp-size": "0.3.0",
     "gulp-uglify": "0.2.1",
     "gulp-useref": "0.4.2",


Mime
View raw message