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/09/23 08:13:52 UTC
[1/2] ignite git commit: # IGNITE-843 Revert
Repository: ignite
Updated Branches:
refs/heads/ignite-843 c9913dd8d -> d6cacf230
# IGNITE-843 Revert
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/edc9ef86
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/edc9ef86
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/edc9ef86
Branch: refs/heads/ignite-843
Commit: edc9ef869176865d52ff636fe39790b305d3461a
Parents: e182690
Author: Andrey <an...@gridgain.com>
Authored: Wed Sep 23 13:13:44 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Sep 23 13:13:44 2015 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/views/sql/sql.jade | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/edc9ef86/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 5a5f8f2..74c4dd5 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
@@ -126,10 +126,13 @@ block container
button.btn.btn-primary(id='export-item-dropdown' data-toggle='dropdown' data-container='body' bs-dropdown='exportDropdown' data-placement='bottom-right')
span.caret
.sql-table-wrapper
- table.table.table-condensed
+ table.table.table-condensed(st-table='displayedResult' st-safe-src='paragraph.rows' float-thead='floatTheadOptions')
+ thead
+ tr
+ th(ng-repeat='col in paragraph.meta track by $index' ng-if='paragraph.columnFilter(col)' bs-tooltip='columnToolTip(col)' data-placement='bottom') {{col.fieldName}}
tbody
- tr(ng-repeat='row in paragraph.rows')
- td(ng-repeat='val in row') {{::val}}
+ tr(ng-repeat='row in displayedResult track by $index')
+ td(ng-repeat='val in row track by $index' ng-if='paragraph.columnFilter(paragraph.meta[$index])') {{ val }}
div(ng-show='paragraph.chart() && paragraph.nonEmpty()')
.chart-settings-link
i.fa.fa-chevron-circle-down
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6cacf23
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6cacf23
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6cacf23
Branch: refs/heads/ignite-843
Commit: d6cacf230b0035d7734b5c6a8b04904dde945361
Parents: edc9ef8 c9913dd
Author: Andrey <an...@gridgain.com>
Authored: Wed Sep 23 13:14:00 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Sep 23 13:14:00 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------