You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/11/05 11:53:29 UTC
[1/2] ignite git commit: IGNITE-1730 Specific message when chart
columns do not exist.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 97885ee4d -> fa2e2fc1b
IGNITE-1730 Specific message when chart columns do not exist.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e3e7b5de
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e3e7b5de
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e3e7b5de
Branch: refs/heads/ignite-843-rc1
Commit: e3e7b5de9a1941119fc0fead35238edf321c2b29
Parents: 97885ee
Author: Andrey <an...@gridgain.com>
Authored: Thu Nov 5 17:45:19 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Nov 5 17:45:19 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 1 +
modules/control-center-web/src/main/js/views/sql/sql.jade | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e3e7b5de/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 9e4b18d..df72f27 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -568,6 +568,7 @@ button.form-control {
}
.sql-empty-result {
+ margin-top: 10px;
margin-bottom: 10px;
text-align: center;
color: $ignite-placeholder-color;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e3e7b5de/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 7c3ef76..895a213 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
@@ -42,7 +42,7 @@ mixin result-toolbar
+btn-toolbar-data('fa-area-chart', 'area', 'Show area chart<br/>By default first column - X values, second column - Y values<br/>In case of one column it will be treated as Y values')
mixin chart-settings(mdl)
- .row(ng-show='paragraph.chart')
+ .row(ng-show='paragraph.chart && paragraph.chartColumns.length > 0')
.col-xs-4.chart-settings-link
i.fa.fa-chevron-circle-down
a(ng-click='$event.stopPropagation()' bs-popover data-template-url='chart-settings' data-placement='bottom' data-auto-close='1' data-trigger='click') Chart settings
@@ -180,9 +180,11 @@ block container
div(ng-show='paragraph.chart() && paragraph.nonEmpty()')
div(ng-show='paragraph.queryExecute()')
+chart-settings
- div(ng-hide='paragraph.chartColumnsConfigured()')
+ div(ng-show='paragraph.chartColumns.length > 0 && !paragraph.chartColumnsConfigured()')
.sql-empty-result Cannot display chart. Please configure axis using 
b Chart settings
+ div(ng-show='paragraph.chartColumns.length == 0')
+ .sql-empty-result Cannot display chart. Result set must contain Java build-in type columns. Please change query and execute it again.
div(ng-show='paragraph.chartColumnsConfigured()')
div(ng-show='paragraph.timeLineSupported() || !paragraph.chartTimeLineEnabled()')
div(ng-repeat='chart in paragraph.charts')
[2/2] ignite git commit: IGNITE-843 Bug fix.
Posted by an...@apache.org.
IGNITE-843 Bug fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa2e2fc1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa2e2fc1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa2e2fc1
Branch: refs/heads/ignite-843-rc1
Commit: fa2e2fc1b6eaf0f648bbba8ff4d6317334a7b38f
Parents: e3e7b5d
Author: Andrey <an...@gridgain.com>
Authored: Thu Nov 5 17:53:22 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Nov 5 17:53:22 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 20 ++++++++++++++++++++
.../main/js/controllers/metadata-controller.js | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa2e2fc1/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 71ed69d..6f71b3d 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
@@ -1675,6 +1675,26 @@ consoleModule.filter('tablesSearch', function() {
}
});
+consoleModule.filter('igfssSearch', function() {
+ return function(array, query) {
+ if (!angular.isUndefined(array) && !angular.isUndefined(query) && !angular.isUndefined(query.$)) {
+ var filtredArray = [];
+
+ var matchString = query.$.toLowerCase();
+
+ angular.forEach(array, function (row) {
+ var label = row.name.toLowerCase();
+
+ if (label.indexOf(matchString) >= 0)
+ filtredArray.push(row);
+ });
+
+ return filtredArray;
+ } else
+ return array;
+ }
+});
+
// Filter metadata with key fields configuration.
consoleModule.filter('metadatasValidation', ['$common', function ($common) {
return function(metadatas, valid, invalid) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa2e2fc1/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index 4d16ea8..9c46a6d 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -832,7 +832,7 @@ consoleModule.controller('metadataController', [
if (indexes && indexes.length > 0) {
_.forEach(indexes, function(index) {
if ($common.isEmptyArray(index.fields))
- return showPopoverMessage($scope.panels, 'query', 'indexes' + i, 'Group fields are not specified');
+ return showPopoverMessage($scope.panels, 'query', 'indexes' + index, 'Group fields are not specified');
});
}
}