ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [39/50] [abbrv] ignite git commit: IGNITE-843 Cleanup
Date Tue, 01 Dec 2015 09:02:51 GMT
IGNITE-843 Cleanup


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

Branch: refs/heads/ignite-843-rc2
Commit: a8c8ebf6f1b2aaa3fcaf3901195ef1b1dc4a0299
Parents: 6b19f87
Author: Andrey <anovikov@gridgain.com>
Authored: Tue Dec 1 10:12:14 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Tue Dec 1 10:12:14 2015 +0700

----------------------------------------------------------------------
 .../main/js/app/modules/configuration-sidebar/main.js   |  2 +-
 .../src/main/js/controllers/common-module.js            | 12 ++++++------
 modules/control-center-web/src/main/js/routes/admin.js  |  2 +-
 modules/control-center-web/src/main/js/routes/public.js |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a8c8ebf6/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
b/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
index 5a2abff..8d34064 100644
--- a/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
+++ b/modules/control-center-web/src/main/js/app/modules/configuration-sidebar/main.js
@@ -18,7 +18,7 @@
 import angular from 'angular'
 
 angular
-.module('ignite-console.configuration-sidebar', [
+.module('ignite-console.configuration.sidebar', [
 
 ])
 .provider('igniteConfigurationSidebar', function() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8c8ebf6/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index b235796..7cb5011 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -20,8 +20,8 @@ var consoleModule = angular.module('ignite-web-console',
         'ngAnimate', 'ngSanitize', 'mgcrea.ngStrap', 'smart-table', 'ui.ace', 'treeControl',
'darthwade.dwLoading', 'agGrid', 'nvd3', 'dndLists'
         /* ignite:modules */
         , 'ignite-console'
-        , 'ignite-web-console.navbar'
-        , 'ignite-web-console.configuration.sidebar'
+        , 'ignite-console.navbar'
+        , 'ignite-console.configuration.sidebar'
         /* endignite */
         /* ignite:plugins */
         /* endignite */
@@ -34,7 +34,7 @@ var consoleModule = angular.module('ignite-web-console',
 
         $rootScope.revertIdentity = function () {
             $http
-                .get('/api/v1/admin/revertIdentity')
+                .get('/api/v1/admin/revert/identity')
                 .then(User.read)
                 .then(function (user) {
                     $rootScope.$broadcast('user', user);
@@ -2033,7 +2033,7 @@ consoleModule.controller('resetPassword', [
     '$scope', '$modal', '$http', '$common', '$focus', 'Auth', '$state',
     function ($scope, $modal, $http, $common, $focus, Auth, $state) {
         if ($state.params.token)
-            $http.post('/api/v1/password/validate-token', {token: $state.params.token})
+            $http.post('/api/v1/validate/token', {token: $state.params.token})
                 .success(function (res) {
                     $scope.email = res.email;
                     $scope.token = res.token;
@@ -2075,7 +2075,7 @@ consoleModule.controller('auth', [
 
 // Download agent controller.
 consoleModule.controller('agent-download', [
-    '$http', '$common', '$scope', '$interval', '$modal', '$window', function ($http, $common,
$scope, $interval, $modal, $window) {
+    '$http', '$common', '$scope', '$interval', '$modal', '$state', function ($http, $common,
$scope, $interval, $modal, $state) {
         // Pre-fetch modal dialogs.
         var _agentDownloadModal = $modal({scope: $scope, templateUrl: '/templates/agent-download.html',
show: false, backdrop: 'static'});
 
@@ -2095,7 +2095,7 @@ consoleModule.controller('agent-download', [
          */
         $scope.goBack = function () {
             if (_agentDownloadModal.backLink)
-                $window.location = _agentDownloadModal.backLink;
+                $state.go(_agentDownloadModal.backLink);
 
             _stopInterval();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8c8ebf6/modules/control-center-web/src/main/js/routes/admin.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/admin.js b/modules/control-center-web/src/main/js/routes/admin.js
index 7ff5eee..da405e8 100644
--- a/modules/control-center-web/src/main/js/routes/admin.js
+++ b/modules/control-center-web/src/main/js/routes/admin.js
@@ -111,7 +111,7 @@ router.get('/become', function (req, res) {
 });
 
 // Become user.
-router.get('/revertIdentity', function (req, res) {
+router.get('/revert/identity', function (req, res) {
     req.session.viewedUser = null;
 
     return res.sendStatus(200);

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8c8ebf6/modules/control-center-web/src/main/js/routes/public.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/public.js b/modules/control-center-web/src/main/js/routes/public.js
index 717b217..5e83f81 100644
--- a/modules/control-center-web/src/main/js/routes/public.js
+++ b/modules/control-center-web/src/main/js/routes/public.js
@@ -211,7 +211,7 @@ router.post('/password/reset', function(req, res) {
 });
 
 /* GET reset password page. */
-router.post('/password/validate-token', function (req, res) {
+router.post('/validate/token', function (req, res) {
     var token = req.body.token;
 
     var data = {token: token};


Mime
View raw message