Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 0f9c8f887 -> b88a5a850
IGNITE-843 Fix: forgot to pass password for database + minor changes. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b88a5a85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b88a5a85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b88a5a85 Branch: refs/heads/ignite-843 Commit: b88a5a8501dac3d8e404ba9fb6ff7424f87bafd0 Parents: 0f9c8f8 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Fri Aug 21 15:31:17 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Fri Aug 21 15:31:17 2015 +0700 ---------------------------------------------------------------------- modules/control-center-web/src/main/js/routes/agent.js | 2 +- .../src/main/js/views/configuration/metadata-load.jade | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b88a5a85/modules/control-center-web/src/main/js/routes/agent.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/agent.js b/modules/control-center-web/src/main/js/routes/agent.js index 2796625..d0fba45 100644 --- a/modules/control-center-web/src/main/js/routes/agent.js +++ b/modules/control-center-web/src/main/js/routes/agent.js @@ -116,7 +116,7 @@ router.post('/metadata', function (req, res) { if (client) { var params = req.body; - client.extractMetadata(params.jdbcDriverJar, params.jdbcDriverClass, params.jdbcUrl, {user: params.user}, true, function (err, meta) { + client.extractMetadata(params.jdbcDriverJar, params.jdbcDriverClass, params.jdbcUrl, {user: params.user, password: params.password}, true, function (err, meta) { if (err) return res.status(500).send(err); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b88a5a85/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 8d9a4e4..4b22ff4 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 @@ -35,17 +35,15 @@ include ../includes/controls table.table.table-condensed.table-stripped.metadata(st-table='displayedTables' st-safe-src='loadMeta.tables') thead tr - th - th - th.header + th.header(colspan="2") input.form-control(type='text' st-search='' placeholder='Filter tables...') tr - th + th(width='50px') input(type='checkbox' ng-model='loadMeta.allSelected' ng-change='loadMeta.selectAll()') + th(width='30%') + label Schema th - label Schemas - th - label Tables + label Table tbody tr(ng-repeat='table in displayedTables')
