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 WIP.
Date Fri, 15 Jan 2016 11:16:29 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 d603a53a8 -> 3f25639d1


IGNITE-843 WIP.


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

Branch: refs/heads/ignite-843-rc2
Commit: 3f25639d1069a4c704f44e6881fba0a55bea6e12
Parents: d603a53
Author: Andrey <anovikov@gridgain.com>
Authored: Fri Jan 15 18:16:36 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Fri Jan 15 18:16:36 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/app/modules/QueryNotebooks/index.js                | 2 +-
 .../control-center-web/src/main/js/controllers/common-module.js    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3f25639d/modules/control-center-web/src/main/js/app/modules/QueryNotebooks/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/QueryNotebooks/index.js b/modules/control-center-web/src/main/js/app/modules/QueryNotebooks/index.js
index b87a506..fdc7bcb 100644
--- a/modules/control-center-web/src/main/js/app/modules/QueryNotebooks/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/QueryNotebooks/index.js
@@ -41,7 +41,7 @@ angular
                     name: 'Query with aggregates',
                     cacheName: 'CarCache',
                     pageSize: 50,
-                    query: 'SELECT p.name, count(*) AS cnt\nFROM "ParkingCache".Parking p\nINNER
JOIN "CarCache".Car c\nON (p.id) = (c.parkingId)\nGROUP BY P.NAME',
+                    query: 'SELECT p.name, count(*) AS cnt\nFROM "ParkingCache".Parking p\nINNER
JOIN "CarCache".Car c\n  ON (p.id) = (c.parkingId)\nGROUP BY P.NAME',
                     result: 'table',
                     rate: {
                         value: 30,

http://git-wip-us.apache.org/repos/asf/ignite/blob/3f25639d/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 b5f3478..41e1a0c 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
@@ -2019,6 +2019,8 @@ consoleModule.service('$agentDownload', [
          * Special dialog hide function.
          */
         _agentDownloadModal.hide = function () {
+            _stopInterval();
+
             $common.hideAlert();
 
             _agentDownloadHide();


Mime
View raw message