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 2017/03/23 07:16:24 UTC
[49/51] [abbrv] ignite git commit: IGNITE-4830 Fixed error ui.
IGNITE-4830 Fixed error ui.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48e78a99
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48e78a99
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48e78a99
Branch: refs/heads/ignite-4829
Commit: 48e78a99b9f7daad079fc8663acb31a5d6610012
Parents: 6a148e2
Author: Andrey Novikov <an...@gridgain.com>
Authored: Thu Mar 23 10:57:03 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Thu Mar 23 10:57:03 2017 +0700
----------------------------------------------------------------------
.../frontend/public/stylesheets/style.scss | 3 +--
modules/web-console/frontend/views/sql/sql.tpl.pug | 17 +++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48e78a99/modules/web-console/frontend/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/stylesheets/style.scss b/modules/web-console/frontend/public/stylesheets/style.scss
index 2f4966f..8dbf123 100644
--- a/modules/web-console/frontend/public/stylesheets/style.scss
+++ b/modules/web-console/frontend/public/stylesheets/style.scss
@@ -752,8 +752,7 @@ button.form-control {
.error {
padding: 10px 10px;
- text-align: center;
- color: $brand-primary;
+ text-align: left;
}
.empty {
http://git-wip-us.apache.org/repos/asf/ignite/blob/48e78a99/modules/web-console/frontend/views/sql/sql.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/sql/sql.tpl.pug b/modules/web-console/frontend/views/sql/sql.tpl.pug
index 701ee14..dcfc531 100644
--- a/modules/web-console/frontend/views/sql/sql.tpl.pug
+++ b/modules/web-console/frontend/views/sql/sql.tpl.pug
@@ -110,10 +110,9 @@ mixin query-settings
span Allow non-collocated joins
.row(ng-if='enforceJoinOrderAvailable(paragraph)')
label.tipLabel(bs-tooltip data-placement='bottom' data-title='Enforce join order of tables in the query.<br/>\
- If <b>set</b> then query optimizer will not reorder tables in join.<br/>\
- <b>NOTE:</b> It is not recommended to enable this property until you are sure that\
- your indexes and the query itself are correct and tuned as much as possible but\
- query optimizer still produces wrong join order.' data-trigger='hover')
+ If <b>set</b>, then query optimizer will not reorder tables within join.<br/>\
+ <b>NOTE:</b> It is not recommended to enable this property unless you have verified that\
+ indexes are not selected in optimal order.' data-trigger='hover')
input(type='checkbox' ng-model='paragraph.enforceJoinOrder')
span Enforce join order
@@ -247,16 +246,18 @@ mixin paragraph-query
.pull-right
+query-settings
.col-sm-12.sql-result(ng-if='paragraph.queryExecuted()' ng-switch='paragraph.resultType()')
- .error(ng-switch-when='error') Error: {{paragraph.error.message}}
+ .error(ng-switch-when='error')
+ label Error: {{paragraph.error.message}}
+ br
+ a(ng-show='paragraph.resultType() === "error"' ng-click='showStackTrace(paragraph)') Show more
.empty(ng-switch-when='empty') Result set is empty
.table(ng-switch-when='table')
+table-result-heading-query
+table-result-body
.chart(ng-switch-when='chart')
+chart-result
- .footer.clearfix
- a.pull-left(ng-show='paragraph.resultType() === "error"' ng-click='showStackTrace(paragraph)') Show error details
- a.pull-left(ng-show='paragraph.resultType() !== "error"' ng-click='showResultQuery(paragraph)') Show query
+ .footer.clearfix(ng-show='paragraph.resultType() !== "error"')
+ a.pull-left(ng-click='showResultQuery(paragraph)') Show query
-var nextVisibleCondition = 'paragraph.resultType() !== "error" && paragraph.queryId && paragraph.nonRefresh() && (paragraph.table() || paragraph.chart() && !paragraph.scanExplain())'