Преглед изворни кода

move deleteProject from collab manager to editor controller

Henry Oswald пре 12 година
родитељ
комит
3983e77b73

+ 5 - 0
services/web/app/coffee/Features/Editor/EditorController.coffee

@@ -237,6 +237,11 @@ module.exports = EditorController =
 			EditorRealTimeController.emitToRoom(project_id, 'projectDescriptionUpdated', description)
 			callback()
 
+	deleteProject: (project_id, callback)->
+		Metrics.inc "editor.delete-project"
+		logger.log project_id:project_id, "recived message to delete project"
+		ProjectHandler.deleteProject project_id, callback
+
 	p:
 		notifyProjectUsersOfNewFolder: (project_id, folder_id, folder, callback = (error)->)->
 			logger.log project_id:project_id, folder:folder, parentFolder_id:folder_id, "sending newly created folder out to users"

+ 0 - 5
services/web/app/coffee/managers/CollaberationManager.coffee

@@ -15,11 +15,6 @@ EditorRealTimeController = require('../Features/Editor/EditorRealTimeController'
 module.exports = class CollaberationManager
 	constructor: (@io)->
 
-	deleteProject: (project_id, callback)->
-		metrics.inc "editor.delete-project"
-		logger.log project_id:project_id, "recived message to delete project"
-		projectHandler.deleteProject project_id, callback
-
 	renameEntity: (project_id, entity_id, entityType, newName, callback)->
 		newName = sanitize.escape(newName)
 		metrics.inc "editor.rename-entity"

+ 1 - 1
services/web/app/coffee/router.coffee

@@ -311,7 +311,7 @@ module.exports = class Router
 
 			client.on 'deleteProject', (callback)->
 				AuthorizationManager.ensureClientCanAdminProject client, (error, project_id) =>
-					collaberationManager.deleteProject(project_id, callback)
+					EditorController.deleteProject(project_id, callback)
 
 			client.on 'setPublicAccessLevel', (newAccessLevel, callback)->
 				AuthorizationManager.ensureClientCanAdminProject client, (error, project_id) =>

+ 12 - 0
services/web/test/UnitTests/coffee/Editor/EditorControllerTests.coffee

@@ -609,3 +609,15 @@ describe "EditorController", ->
 				done()
 
 
+	describe "deleteProject", ->
+
+		beforeEach ->
+			@err = "errro"
+			@ProjectHandler::deleteProject = sinon.stub().callsArgWith(1, @err)
+
+		it "should call the project handler", (done)->
+			@EditorController.deleteProject @project_id, (err)=>
+				err.should.equal @err
+				@ProjectHandler::deleteProject.calledWith(@project_id).should.equal true
+				done()
+