Просмотр исходного кода

changed back to standard /archive /unarchive

Henry Oswald 11 лет назад
Родитель
Сommit
5dd33ea313

+ 0 - 5
services/docstore/app.coffee

@@ -22,11 +22,6 @@ app.get  '/project/:project_id/doc/:doc_id/raw', HttpController.getRawDoc
 app.post '/project/:project_id/doc/:doc_id', bodyParser.json(limit: "2mb"), HttpController.updateDoc
 app.del  '/project/:project_id/doc/:doc_id', HttpController.deleteDoc
 
-
-app.post  '/project/:project_id/deactivate', HttpController.archiveAllDocs
-app.post  '/project/:project_id/reactivate', HttpController.unArchiveAllDocs
-
-# can delete these two soon
 app.post  '/project/:project_id/archive', HttpController.archiveAllDocs
 app.post  '/project/:project_id/unarchive', HttpController.unArchiveAllDocs
 

+ 2 - 6
services/docstore/test/acceptance/coffee/helpers/DocstoreClient.coffee

@@ -43,14 +43,10 @@ module.exports = DocstoreClient =
 		
 	archiveAllDoc: (project_id, callback = (error, res, body) ->) ->
 		request.post {
-			url: "http://localhost:#{settings.internal.docstore.port}/project/#{project_id}/deactivate"
-		}, callback	
-	
-	unArchiveAllDoc: (project_id, callback = (error, res, body) ->) ->
-		request.post {
-			url: "http://localhost:#{settings.internal.docstore.port}/project/#{project_id}/deactivate"
+			url: "http://localhost:#{settings.internal.docstore.port}/project/#{project_id}/archive"
 		}, callback	
 
+
 	getS3Doc: (project_id, doc_id, callback = (error, res, body) ->) ->
 		options = DocArchiveManager.buildS3Options(true, project_id+"/"+doc_id)
 		request.get options, callback