github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-26 12:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

replace error message with Error object

Browse source
This commit is contained in:
Brian Gough 2018-01-31 10:26:31 +00:00
parent 21c1ea6687
commit c652abf739
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/web/app/coffee/Features/Editor/EditorHttpController.coffee
View file

@ -128,12 +128,8 @@ module.exports = EditorHttpController =
folder_id = req.body.folder_id
user_id = AuthenticationController.getLoggedInUserId(req)
EditorController.moveEntity project_id, entity_id, folder_id, entity_type, user_id, (error) ->
if error?.message == 'destination folder is a child folder of me'
res.status(400).json(req.i18n.translate('invalid_file_name'))
else if error?
next(error)
else
res.sendStatus 204
return next(error) if error?
res.sendStatus 204
deleteDoc: (req, res, next)->
req.params.entity_type = "doc"

2
services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
View file

@ -426,7 +426,7 @@ module.exports = ProjectEntityHandler =
logger.log destFolderPath: destFolderPath.fileSystem, folderPath: entityPath.fileSystem, "checking folder is not moving into child folder"
isNestedFolder = destFolderPath.fileSystem.slice(0, entityPath.fileSystem.length) == entityPath.fileSystem
if isNestedFolder
return callback(new Error("destination folder is a child folder of me"))
return callback(new Errors.InvalidNameError("destination folder is a child folder of me"))
callback()
deleteEntity: (project_id, entity_id, entityType, userId, callback = (error) ->)->