Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-27 22:49:56 -05:00
Code Issues Activity

Merge pull request #2869 from ErisDS/issue-2779

Browse source 
Ember redirect to signup
This commit is contained in:
Hannah Wolfe 2014-06-04 15:06:10 +01:00
commit 684ff082ab
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/server/middleware/index.js
View file

@ -180,6 +180,15 @@ function redirectToSignup(req, res, next) {
api.users.doesUserExist().then(function (exists) { api.users.doesUserExist().then(function (exists) {
if (!exists) { if (!exists) {
// TODO remove this when ember admin becomes the default
if (req.path.match(/\/ember\//)) {
if (!req.path.match(/\/ghost\/ember\/signup\//)) {
return res.redirect(config().paths.subdir + '/ghost/ember/signup/');
} else {
return next();
}
}
// END remove this
return res.redirect(config().paths.subdir + '/ghost/signup/'); return res.redirect(config().paths.subdir + '/ghost/signup/');
} }
next(); next();

2
core/server/routes/admin.js
View file

@ -10,7 +10,7 @@ var admin = require('../controllers/admin'),
adminRoutes = function (server) { adminRoutes = function (server) {
// Have ember route look for hits first // Have ember route look for hits first
// to prevent conflicts with pre-existing routes // to prevent conflicts with pre-existing routes
server.get('/ghost/ember/*', admin.index); server.get('/ghost/ember/*', middleware.redirectToSignup, admin.index);
var subdir = config().paths.subdir; var subdir = config().paths.subdir;
// ### Admin routes // ### Admin routes