github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-05 02:46:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1630 from sharelatex/as-allow-deleted-inviter-import

Browse source 
Allow deleted v1 user when importing project invite inviter

GitOrigin-RevId: be8fc8f09452b72128592f9c00859aaa0b535c3d
This commit is contained in:
Shane Kilkelly 2019-03-22 10:10:45 +00:00 committed by sharelatex
parent 0305ba0c6b
commit a51fefae6c
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee
View file

@ -215,7 +215,8 @@ module.exports = CollaboratorsHandler =
else
return callback(new Error("unknown privilegeLevel: #{privilegeLevel}"))
ContactManager.addContact adding_user_id, user_id
if adding_user_id
ContactManager.addContact adding_user_id, user_id
Project.update { _id: project_id }, { $addToSet: level }, (error) ->
return callback(error) if error?

7
services/web/test/unit/coffee/Collaborators/CollaboratorsHandlerTests.coffee
View file

@ -322,6 +322,13 @@ describe "CollaboratorsHandler", ->
it "should not add the user again", ->
@Project.update.called.should.equal false
describe "with null adding_user_id", ->
beforeEach ->
@CollaboratorHandler.addUserIdToProject @project_id, null, @user_id, "readAndWrite", @callback
it "should not add the adding user as a contact", ->
@ContactManager.addContact.called.should.equal(false)
describe "removeUserFromAllProjects", ->
beforeEach (done) ->
@CollaboratorHandler.getProjectsUserIsMemberOf = sinon.stub()