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/12/28 11:54:21 UTC
[1/2] ignite git commit: IGNITE-2277 Added demo and load metadata
description.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 3768edf9e -> 044743081
IGNITE-2277 Added demo and load metadata description.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/149de41c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/149de41c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/149de41c
Branch: refs/heads/ignite-843-rc2
Commit: 149de41ca99beb6dd28ee81e5449c8782b35145e
Parents: 9415940
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Dec 28 17:53:47 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Dec 28 17:53:47 2015 +0700
----------------------------------------------------------------------
.../js/views/configuration/metadata-load.jade | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/149de41c/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
index a6800d0..23da9f9 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
@@ -25,12 +25,24 @@ mixin chk(mdl, change, tip)
#errors-container.modal-header.header
button.close(ng-click='$hide()' aria-hidden='true') ×
h4.modal-title Load metadata from database
- .metadata-content(ng-show='loadMeta.action == "drivers"' style='margin-bottom: 60px')
- .metadata-content(ng-show='loadMeta.action == "connect"' style='margin-bottom: 60px')
+ .metadata-content(ng-show='loadMeta.action == "drivers"')
+ .metadata-content(ng-show='loadMeta.action == "connect"')
form.form-horizontal(name='loadForm' novalidate)
.settings-row(ng-repeat='field in metadataDb')
+form-row-custom(['col-xs-4 col-sm-3 col-md-3'], ['col-xs-8 col-sm-9 col-md-9'], 'preset')
- .metadata-content(ng-show='loadMeta.action == "schemas"')
+ div(ng-show='preset.drvIdx < 1')
+ label Demo description:
+ ul
+ li In-memory H2 database server will be started inside agent
+ li Database will be populated with sample tables
+ li You could test loading metadata using this sample database
+ div(ng-show='preset.drvIdx > 0')
+ label To load metadata:
+ ul
+ li Configure connection to database
+ li Select schemas
+ li Select tables
+ .metadata-content(ng-show='loadMeta.action == "schemas"' style='margin-bottom: 50px')
table.table.metadata(st-table='loadMeta.displayedSchemas' st-safe-src='loadMeta.schemas')
thead
tr
@@ -53,7 +65,7 @@ mixin chk(mdl, change, tip)
input(type='checkbox' ng-model='schema.use' ng-change='selectSchema()')
td
label {{::schema.name}}
- .metadata-content(ng-show='loadMeta.action == "tables"')
+ .metadata-content(ng-show='loadMeta.action == "tables"' style='margin-bottom: 50px')
.metadata-package-name
label.required Package:
span
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/04474308
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/04474308
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/04474308
Branch: refs/heads/ignite-843-rc2
Commit: 044743081b09a82612e6d4c0973ae0a078b1d36c
Parents: 149de41 3768edf
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Dec 28 17:54:14 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Dec 28 17:54:14 2015 +0700
----------------------------------------------------------------------
.../java/org/apache/ignite/agent/AgentLauncher.java | 15 ++++++++++++++-
.../src/main/js/controllers/sql-controller.js | 2 +-
.../src/main/js/public/stylesheets/style.scss | 3 ++-
3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------