You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/07/07 10:43:27 UTC
[1/2] incubator-ignite git commit: IGNITE-843 Fix URL on login.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 073c40fa5 -> 8ad2e2da4
IGNITE-843 Fix URL on login.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/488a5aff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/488a5aff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/488a5aff
Branch: refs/heads/ignite-843
Commit: 488a5aff175bf03f18360c8c193d972b2cf5b6d0
Parents: 073c40f
Author: sevdokimov <se...@jetbrains.com>
Authored: Tue Jul 7 11:43:01 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Tue Jul 7 11:43:01 2015 +0300
----------------------------------------------------------------------
.../nodejs/public/javascripts/controllers/common.js | 2 +-
modules/web-control-center/nodejs/routes/auth.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/488a5aff/modules/web-control-center/nodejs/public/javascripts/controllers/common.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/javascripts/controllers/common.js b/modules/web-control-center/nodejs/public/javascripts/controllers/common.js
index f0221c2..ba3d152 100644
--- a/modules/web-control-center/nodejs/public/javascripts/controllers/common.js
+++ b/modules/web-control-center/nodejs/public/javascripts/controllers/common.js
@@ -182,7 +182,7 @@ configuratorModule.controller('auth', [
.success(function (data) {
authModal.hide();
- $window.location = '/clusters';
+ $window.location = '/configuration/clusters';
})
.error(function (data) {
$alert({placement: 'top', container: '#errors-container', title: $scope.errorMessage(data)});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/488a5aff/modules/web-control-center/nodejs/routes/auth.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/auth.js b/modules/web-control-center/nodejs/routes/auth.js
index 5ed7278..fd018ab 100644
--- a/modules/web-control-center/nodejs/routes/auth.js
+++ b/modules/web-control-center/nodejs/routes/auth.js
@@ -37,7 +37,7 @@ router.post('/register', function(req, res, next) {
if (err)
return res.status(401).send(err.message);
- return res.redirect('/clusters');
+ return res.redirect('/configuration/clusters');
});
});
});
@@ -57,7 +57,7 @@ router.post('/login', function(req, res, next) {
if (err)
return res.status(401).send(err.message);
- res.redirect('/clusters');
+ res.redirect('/configuration/clusters');
});
})(req, res, next);
});
[2/2] incubator-ignite git commit: IGNITE-843 Show URL on 404 error.
Posted by se...@apache.org.
IGNITE-843 Show URL on 404 error.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8ad2e2da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8ad2e2da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8ad2e2da
Branch: refs/heads/ignite-843
Commit: 8ad2e2da4889656ac336bc2ad9f0c33570b27e4b
Parents: 488a5af
Author: sevdokimov <se...@jetbrains.com>
Authored: Tue Jul 7 11:43:21 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Tue Jul 7 11:43:21 2015 +0300
----------------------------------------------------------------------
modules/web-control-center/nodejs/app.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ad2e2da/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 226ccda..b3a58a6 100644
--- a/modules/web-control-center/nodejs/app.js
+++ b/modules/web-control-center/nodejs/app.js
@@ -109,7 +109,7 @@ app.use('/admin', adminRouter);
// Catch 404 and forward to error handler.
app.use(function (req, res, next) {
- var err = new Error('Not Found');
+ var err = new Error('Not Found: ' + req.originalUrl);
err.status = 404;
next(err);
});