github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1233 from sharelatex/ja-owner-userstubs

Browse source 
Allow importing projects by non-owners

GitOrigin-RevId: b8e5597deef8229b22c5605965d246e6ed95d624
This commit is contained in:
James Allen 2018-12-13 09:07:45 +00:00 committed by sharelatex
parent 6e25c872e3
commit d0744d779e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/app/coffee/Features/Project/ProjectCreationHandler.coffee
View file

@ -59,7 +59,8 @@ module.exports = ProjectCreationHandler =
project.imageName ?= Settings.currentImageName project.imageName ?= Settings.currentImageName
project.rootFolder[0] = rootFolder project.rootFolder[0] = rootFolder
User.findById owner_id, "ace.spellCheckLanguage", (err, user)-> User.findById owner_id, "ace.spellCheckLanguage", (err, user)->
project.spellCheckLanguage = user.ace.spellCheckLanguage if user? # It's possible the owner_id is a UserStub
project.spellCheckLanguage = user.ace.spellCheckLanguage
project.save (err)-> project.save (err)->
return callback(err) if err? return callback(err) if err?
callback err, project callback err, project

4
services/web/app/coffee/Features/Project/ProjectEntityUpdateHandler.coffee
View file

@ -168,7 +168,7 @@ module.exports = ProjectEntityUpdateHandler = self =
return callback(error) if error? return callback(error) if error?
callback null, doc, folder_id callback null, doc, folder_id
_uploadFile: (project_id, folder_id, fileName, fsPath, linkedFileData, userId, callback = (error, fileRef, fileStoreUrl) ->)-> _uploadFile: (project_id, folder_id, fileName, fsPath, linkedFileData, callback = (error, fileRef, fileStoreUrl) ->)->
if not SafePath.isCleanFilename fileName if not SafePath.isCleanFilename fileName
return callback new Errors.InvalidNameError("invalid element name") return callback new Errors.InvalidNameError("invalid element name")
fileRef = new File( fileRef = new File(
@ -195,7 +195,7 @@ module.exports = ProjectEntityUpdateHandler = self =
(project_id, folder_id, fileName, fsPath, linkedFileData, userId, callback) -> (project_id, folder_id, fileName, fsPath, linkedFileData, userId, callback) ->
if not SafePath.isCleanFilename fileName if not SafePath.isCleanFilename fileName
return callback new Errors.InvalidNameError("invalid element name") return callback new Errors.InvalidNameError("invalid element name")
ProjectEntityUpdateHandler._uploadFile project_id, folder_id, fileName, fsPath, linkedFileData, userId, (error, fileRef, fileStoreUrl) -> ProjectEntityUpdateHandler._uploadFile project_id, folder_id, fileName, fsPath, linkedFileData, (error, fileRef, fileStoreUrl) ->
return callback(error) if error? return callback(error) if error?
next(project_id, folder_id, fileName, fsPath, linkedFileData, userId, fileRef, fileStoreUrl, callback) next(project_id, folder_id, fileName, fsPath, linkedFileData, userId, fileRef, fileStoreUrl, callback)
withLock: (project_id, folder_id, fileName, fsPath, linkedFileData, userId, fileRef, fileStoreUrl, callback = (error, fileRef, folder_id) ->)-> withLock: (project_id, folder_id, fileName, fsPath, linkedFileData, userId, fileRef, fileStoreUrl, callback = (error, fileRef, folder_id) ->)->