ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/2] ignite git commit: IGNITE-843 Fixed refresh charts.
Date Fri, 11 Sep 2015 16:32:35 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 efe9ae9d0 -> 9f1934e44


IGNITE-843 Fixed refresh charts.


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

Branch: refs/heads/ignite-843
Commit: 7983586bebddc00100ed27158d6c2516e382ea3e
Parents: efe9ae9
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Fri Sep 11 23:32:00 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Fri Sep 11 23:32:00 2015 +0700

----------------------------------------------------------------------
 .../control-center-web/src/main/js/controllers/sql-controller.js | 4 ++++
 modules/control-center-web/src/main/js/views/sql/sql.jade        | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7983586b/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index eb12530..3750f2e 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -348,6 +348,10 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
     };
 
     var _executeRefresh = function (paragraph) {
+        // TODO IGNITE-843 Temporary disable charts refresh by timer
+        if (paragraph.rate.installed && paragraph.chart())
+            return;
+
         $http.post('/agent/query', paragraph.queryArgs)
             .success(_processQueryResult(paragraph))
             .error(function (errMsg) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/7983586b/modules/control-center-web/src/main/js/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade
index 8d3db3d..dda1c43 100644
--- a/modules/control-center-web/src/main/js/views/sql/sql.jade
+++ b/modules/control-center-web/src/main/js/views/sql/sql.jade
@@ -102,8 +102,8 @@ block container
                                         a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph,
true)' ng-click='actionAvailable(paragraph, true) ? execute(paragraph) : ""' data-placement='bottom'
bs-tooltip data-title='{{actionTooltip(paragraph, "execute", true)}}') Execute
                                         a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph,
false)' ng-click='actionAvailable(paragraph, false) ? scan(paragraph): ""' data-placement='bottom'
bs-tooltip data-title='{{actionTooltip(paragraph, "execute scan", false)}}') Scan
                                         .pull-right
-                                            labelHide Hide system columns:
-                                            a.btn.btn-default.fa.fa-columns.tipLabel(ng-class='{"btn-info":
paragraph.hideSystemColumns}' ng-click='toggleSystemColumns(paragraph)' ng-disabled='paragraph.disabledSystemColumns')
+                                            labelHide System columns:
+                                            a.btn.btn-default.fa.fa-bars.tipLabel(ng-class='{"btn-info":
!paragraph.hideSystemColumns}' ng-click='toggleSystemColumns(paragraph)' ng-disabled='paragraph.disabledSystemColumns')
                                             label.tipLabel Refresh rate:
                                             button.btn.btn-default.fa.fa-clock-o.tipLabel(ng-class='{"btn-info":
paragraph.rate && paragraph.rate.installed}' bs-popover data-template-url='rate' data-placement='left'
data-auto-close='1' data-trigger='click') {{rateAsString(paragraph)}}
                                             label.tipLabel Page size:


Mime
View raw message