Przeglądaj źródła

Merge pull request #252 from sharelatex/per-user-containers-part-0

Per user containers part 0
Brian Gough 10 lat temu
rodzic
commit
47574d7c7e

+ 1 - 3
services/web/app/coffee/Features/Compile/ClsiManager.coffee

@@ -84,10 +84,8 @@ module.exports = ClsiManager =
 	_parseOutputFiles: (project_id, rawOutputFiles = []) ->
 	_parseOutputFiles: (project_id, rawOutputFiles = []) ->
 		outputFiles = []
 		outputFiles = []
 		for file in rawOutputFiles
 		for file in rawOutputFiles
-			path = Url.parse(file.url).path
-			path = path.replace("/project/#{project_id}/output/", "")
 			outputFiles.push
 			outputFiles.push
-				path: path
+				path: file.path # the clsi is now sending this to web
 				type: file.type
 				type: file.type
 				build: file.build
 				build: file.build
 		return outputFiles
 		return outputFiles

+ 2 - 0
services/web/test/UnitTests/coffee/Compile/ClsiManagerTests.coffee

@@ -45,10 +45,12 @@ describe "ClsiManager", ->
 						status: @status = "success"
 						status: @status = "success"
 						outputFiles: [{
 						outputFiles: [{
 							url: "#{@settings.apis.clsi.url}/project/#{@project_id}/output/output.pdf"
 							url: "#{@settings.apis.clsi.url}/project/#{@project_id}/output/output.pdf"
+							path: "output.pdf"
 							type: "pdf"
 							type: "pdf"
 							build: 1234
 							build: 1234
 						},{
 						},{
 							url: "#{@settings.apis.clsi.url}/project/#{@project_id}/output/output.log"
 							url: "#{@settings.apis.clsi.url}/project/#{@project_id}/output/output.log"
+							path: "output.log"
 							type: "log"
 							type: "log"
 							build: 1234
 							build: 1234
 						}]
 						}]