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/07/14 07:04:52 UTC
[1/2] incubator-ignite git commit: # ignite-843 Minor fix.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 9c93dcc4e -> 37c975f1f
# ignite-843 Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/31ff6149
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/31ff6149
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/31ff6149
Branch: refs/heads/ignite-843
Commit: 31ff6149285e44dd55a0a61f4d02022ecb0d7df5
Parents: a7efd5d
Author: Andrey <an...@gridgain.com>
Authored: Tue Jul 14 12:02:22 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Jul 14 12:02:22 2015 +0700
----------------------------------------------------------------------
modules/web-control-center/nodejs/app.js | 8 --------
modules/web-control-center/nodejs/routes/sql.js | 2 --
2 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/31ff6149/modules/web-control-center/nodejs/app.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/app.js b/modules/web-control-center/nodejs/app.js
index 9fb4398..c9b79ab 100644
--- a/modules/web-control-center/nodejs/app.js
+++ b/modules/web-control-center/nodejs/app.js
@@ -35,8 +35,6 @@ var adminRouter = require('./routes/admin');
var profileRouter = require('./routes/profile');
var sqlRouter = require('./routes/sql');
-var uiUtils = require('./helpers/ui-utils');
-
var passport = require('passport');
var db = require('./db');
@@ -96,12 +94,6 @@ var adminOnly = function(req, res, next) {
app.all('/configuration/*', mustAuthenticated);
-for (var p in uiUtils) {
- if (uiUtils.hasOwnProperty(p)) {
- app.locals[p] = uiUtils[p];
- }
-}
-
app.all('*', function(req, res, next) {
var becomeUsed = req.session.viewedUser && req.user.admin;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/31ff6149/modules/web-control-center/nodejs/routes/sql.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/sql.js b/modules/web-control-center/nodejs/routes/sql.js
index ea3465c..ce4565d 100644
--- a/modules/web-control-center/nodejs/routes/sql.js
+++ b/modules/web-control-center/nodejs/routes/sql.js
@@ -17,8 +17,6 @@
var router = require('express').Router();
var db = require('../db');
-var uiUtils = require('../helpers/ui-utils');
-
router.get('/', function(req, res) {
res.render('sql/sql');
});
[2/2] incubator-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
# Conflicts:
# modules/web-control-center/nodejs/routes/sql.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/37c975f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/37c975f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/37c975f1
Branch: refs/heads/ignite-843
Commit: 37c975f1fa26b7cf36f672c15779416cb93e1bf1
Parents: 31ff614 9c93dcc
Author: Andrey <an...@gridgain.com>
Authored: Tue Jul 14 12:03:05 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Jul 14 12:03:05 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/models/metadata.json | 67 ++++-----
modules/web-control-center/nodejs/db.js | 15 +-
.../web-control-center/nodejs/routes/admin.js | 16 +-
.../web-control-center/nodejs/routes/caches.js | 14 +-
.../nodejs/routes/clusters.js | 16 +-
.../nodejs/routes/metadata.js | 14 +-
.../nodejs/routes/persistence.js | 147 ++++++++++---------
.../web-control-center/nodejs/routes/public.js | 26 ++--
.../web-control-center/nodejs/routes/summary.js | 12 +-
.../nodejs/views/includes/controls.jade | 48 ++++++
10 files changed, 216 insertions(+), 159 deletions(-)
----------------------------------------------------------------------