github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #957 from sharelatex/hb-force-v1-image-templates

Browse source 
Force gallery items to use legacy OL v1 texlive image
This commit is contained in:
Brian Gough 2018-09-25 09:27:54 +01:00 committed by GitHub
commit a524f99fbf
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
services/web/app/coffee/Features/Templates/TemplatesController.coffee
View file

@ -45,6 +45,7 @@ module.exports = TemplatesController =
docId: req.body.docId
templateId: req.body.templateId
templateVersionId: req.body.templateVersionId
image: 'wl_texlive:2018.1'
},
req,
res
@ -63,18 +64,25 @@ module.exports = TemplatesController =
logger.err err:err, zipReq:zipReq, "problem building project from zip"
return res.sendStatus 500
setCompiler project._id, options.compiler, ->
fs.unlink dumpPath, ->
delete req.session.templateData
conditions = {_id:project._id}
update = {
fromV1TemplateId:options.templateId,
fromV1TemplateVersionId:options.templateVersionId
}
Project.update conditions, update, {}, (err)->
res.redirect "/project/#{project._id}"
setImage project._id, options.image, ->
fs.unlink dumpPath, ->
delete req.session.templateData
conditions = {_id:project._id}
update = {
fromV1TemplateId:options.templateId,
fromV1TemplateVersionId:options.templateVersionId
}
Project.update conditions, update, {}, (err)->
res.redirect "/project/#{project._id}"
setCompiler = (project_id, compiler, callback)->
if compiler?
ProjectOptionsHandler.setCompiler project_id, compiler, callback
else
callback()
setImage = (project_id, imageName, callback)->
if imageName?
ProjectOptionsHandler.setImageName project_id, imageName, callback
else
callback()

5
services/web/test/unit/coffee/Templates/TemplatesControllerTests.coffee
View file

@ -22,7 +22,10 @@ describe 'TemplatesController', ->
}
@ProjectUploadManager = {createProjectFromZipArchive : sinon.stub().callsArgWith(3, null, {_id:project_id})}
@dumpFolder = "dump/path"
@ProjectOptionsHandler = {setCompiler:sinon.stub().callsArgWith(2)}
@ProjectOptionsHandler = {
setCompiler:sinon.stub().callsArgWith(2)
setImageName:sinon.stub().callsArgWith(2)
}
@uuid = "1234"
@ProjectDetailsHandler =
getProjectDescription:sinon.stub()