You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/10 14:30:06 UTC
ignite git commit: IGNITE-843 Fixed typo in condition.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 dc442ad3d -> 683b8b708
IGNITE-843 Fixed typo in condition.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/683b8b70
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/683b8b70
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/683b8b70
Branch: refs/heads/ignite-843
Commit: 683b8b708a45c22626ec471dae77840ede7b57db
Parents: dc442ad
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Sep 10 19:30:00 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Sep 10 19:30:00 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/683b8b70/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 dd26858..8bda268 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
@@ -29,11 +29,7 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
$scope.pageSizes = [50, 100, 200, 400, 800, 1000];
- $scope.modes = [
- {value: 'PARTITIONED', label: 'PARTITIONED'},
- {value: 'REPLICATED', label: 'REPLICATED'},
- {value: 'LOCAL', label: 'LOCAL'}
- ];
+ $scope.modes = $common.mkOptions(['PARTITIONED', 'REPLICATED', 'LOCAL']);
$scope.timeUnit = [
{value: 1000, label: 'seconds', short: 's'},
@@ -335,8 +331,10 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
paragraph.rows = res.rows;
- if (paragraph.result = 'none')
+ if (paragraph.result == 'none')
paragraph.result = 'table';
+ else if (paragraph.chart)
+ $scope.applyChartSettings(paragraph);
}
};