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

ProjectEntityHandler.addFolder take only project id and

Browse source 
only gets project folder structure
This commit is contained in:
Henry Oswald 2016-02-23 15:45:40 +00:00
parent 2a6e09a41b
commit 7a28eeeaa0
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,7 @@ module.exports =
copyFolder = (folder, desFolder, callback)-> copyFolder = (folder, desFolder, callback)->
jobs = folder.folders.map (childFolder)-> jobs = folder.folders.map (childFolder)->
return (callback)-> return (callback)->
projectEntityHandler.addFolder newProject, desFolder._id, childFolder.name, (err, newFolder)-> projectEntityHandler.addFolder newProject._id, desFolder._id, childFolder.name, (err, newFolder)->
copyFolder childFolder, newFolder, callback copyFolder childFolder, newFolder, callback
jobs.push (cb)-> jobs.push (cb)->
copyDocs folder, desFolder, cb copyDocs folder, desFolder, cb

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

@ -236,12 +236,12 @@ module.exports = ProjectEntityHandler =
!folder.filterOut !folder.filterOut
callback(null, folders, lastFolder) callback(null, folders, lastFolder)
addFolder: (project_or_id, parentFolder_id, folderName, callback) -> addFolder: (project_id, parentFolder_id, folderName, callback) ->
folder = new Folder name: folderName folder = new Folder name: folderName
Project.getProject project_or_id, "", (err, project) -> ProjectGetter.getProjectWithOnlyFolders project_id, (err, project)=>
return callback(err) if err? return callback(err) if err?
confirmFolder project, parentFolder_id, (parentFolder_id)=> confirmFolder project, parentFolder_id, (parentFolder_id)=>
logger.log project: project_or_id, parentFolder_id:parentFolder_id, folderName:folderName, "new folder added" logger.log project: project_id, parentFolder_id:parentFolder_id, folderName:folderName, "new folder added"
Project.putElement project._id, parentFolder_id, folder, "folder", (err, result)=> Project.putElement project._id, parentFolder_id, folder, "folder", (err, result)=>
if callback? if callback?
callback(err, folder, parentFolder_id) callback(err, folder, parentFolder_id)

4
services/web/test/UnitTests/coffee/Project/ProjectDuplicatorTests.coffee
View file

@ -124,8 +124,8 @@ describe 'ProjectDuplicator', ->
it 'should copy all the folders', (done)-> it 'should copy all the folders', (done)->
@duplicator.duplicate @owner, @project_id, "", (err, newProject)=> @duplicator.duplicate @owner, @project_id, "", (err, newProject)=>
@entityHandler.addFolder.calledWith(@stubbedNewProject, @stubbedNewProject.rootFolder[0]._id, @level1folder.name).should.equal true @entityHandler.addFolder.calledWith(@stubbedNewProject._id, @stubbedNewProject.rootFolder[0]._id, @level1folder.name).should.equal true
@entityHandler.addFolder.calledWith(@stubbedNewProject, @newFolder._id, @level2folder.name).should.equal true @entityHandler.addFolder.calledWith(@stubbedNewProject._id, @newFolder._id, @level2folder.name).should.equal true
@entityHandler.addFolder.callCount.should.equal 2 @entityHandler.addFolder.callCount.should.equal 2
done() done()