From 218f5fedf8b64c9338ead6c67c3b2e8df5a41e18 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 7 Nov 2014 11:21:55 +0000 Subject: [PATCH] Fix broken template creation route --- .../app/coffee/Features/Templates/TemplatesRouter.coffee | 7 +++++++ services/web/app/coffee/router.coffee | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/services/web/app/coffee/Features/Templates/TemplatesRouter.coffee b/services/web/app/coffee/Features/Templates/TemplatesRouter.coffee index c761d8d79d..bc03ca799c 100644 --- a/services/web/app/coffee/Features/Templates/TemplatesRouter.coffee +++ b/services/web/app/coffee/Features/Templates/TemplatesRouter.coffee @@ -1,6 +1,8 @@ SecurityManager = require("../../managers/SecurityManager") +AuthenticationController = require("../Authentication/AuthenticationController") TemplatesWebController = require("./TemplatesWebController") TemplatesController = require("./TemplatesController") +TemplatesMiddlewear = require('./TemplatesMiddlewear') middleWear = require("./TemplatesMiddlewear") module.exports = @@ -20,4 +22,9 @@ module.exports = app.post "/project/:Project_id/template/publish", SecurityManager.requestIsOwner, TemplatesController.publishProject app.post "/project/:Project_id/template/unpublish", SecurityManager.requestIsOwner, TemplatesController.unpublishProject app.post "/project/:Project_id/template/description", SecurityManager.requestCanModifyProject, TemplatesController.updateProjectDescription + + # Make sure the /project/new/template route comes before the /project/:project_id/template route + # This is a get request so that it can be linked to. + app.get '/project/new/template', TemplatesMiddlewear.saveTemplateDataInSession, AuthenticationController.requireLogin(), TemplatesController.createProjectFromZipTemplate + app.get "/project/:Project_id/template", SecurityManager.requestCanAccessProject, TemplatesController.getTemplateDetails \ No newline at end of file diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 4a393d54e2..269854e6bd 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -16,8 +16,6 @@ metrics = require('./infrastructure/Metrics') ReferalController = require('./Features/Referal/ReferalController') ReferalMiddleware = require('./Features/Referal/ReferalMiddleware') TemplatesRouter = require('./Features/Templates/TemplatesRouter') -TemplatesController = require('./Features/Templates/TemplatesController') -TemplatesMiddlewear = require('./Features/Templates/TemplatesMiddlewear') AuthenticationController = require('./Features/Authentication/AuthenticationController') TagsController = require("./Features/Tags/TagsController") CollaboratorsRouter = require('./Features/Collaborators/CollaboratorsRouter') @@ -93,8 +91,6 @@ module.exports = class Router app.get '/project', AuthenticationController.requireLogin(), ProjectController.projectListPage app.post '/project/new', AuthenticationController.requireLogin(), ProjectController.newProject - app.get '/project/new/template', TemplatesMiddlewear.saveTemplateDataInSession, AuthenticationController.requireLogin(), TemplatesController.createProjectFromZipTemplate - app.get '/Project/:Project_id', SecurityManager.requestCanAccessProject, ProjectController.loadEditor app.get '/Project/:Project_id/file/:File_id', SecurityManager.requestCanAccessProject, FileStoreController.getFile