ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: ignite-843 Fixed after merge.
Date Wed, 07 Oct 2015 03:04:31 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 03b3b4f8e -> ca320ba1c


ignite-843 Fixed after merge.


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

Branch: refs/heads/ignite-843
Commit: ca320ba1c6b7e86d82ade402c915c0bee2b4e5e1
Parents: 03b3b4f
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Oct 7 10:04:22 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Oct 7 10:04:22 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/common-module.js                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ca320ba1/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 cc0ddab..c977dbc 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
@@ -1347,7 +1347,7 @@ consoleModule.service('$preview', ['$timeout', '$interval', function
($timeout,
 
         var newContent = content.lines;
 
-        if (content.checkFn == 'remove')
+        if (content.action == 'remove')
             prevContent = content.lines;
         else if (prevContent.length > 0 && newContent.length > 0 &&
editor.attractAttention) {
             if (clearPromise) {
@@ -1825,7 +1825,7 @@ consoleModule.controller('activeLink', [
 consoleModule.controller('auth', [
     '$scope', '$modal', '$http', '$window', '$common', '$focus',
     function ($scope, $modal, $http, $window, $common, $focus) {
-        $scope.checkFn = 'login';
+        $scope.action = 'login';
 
         $scope.userDropdown = [{text: 'Profile', href: '/profile'}];
 
@@ -1843,7 +1843,7 @@ consoleModule.controller('auth', [
 
         // Try to authorize user with provided credentials.
         $scope.auth = function (action, user_info) {
-            $http.post('/' + checkFn, user_info)
+            $http.post('/' + action, user_info)
                 .success(function () {
                     $window.location = '/configuration/clusters';
                 })


Mime
View raw message