Przeglądaj źródła

Merge pull request #253 from sharelatex/per-user-containers-part-1

Per user containers part 1
Brian Gough 10 lat temu
rodzic
commit
8bc5f53562

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

@@ -86,6 +86,7 @@ module.exports = ClsiManager =
 		for file in rawOutputFiles
 			outputFiles.push
 				path: file.path # the clsi is now sending this to web
+				url: Url.parse(file.url).path # the location of the file on the clsi, excluding the host part
 				type: file.type
 				build: file.build
 		return outputFiles

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

@@ -44,12 +44,12 @@ describe "ClsiManager", ->
 					compile:
 						status: @status = "success"
 						outputFiles: [{
-							url: "#{@settings.apis.clsi.url}/project/#{@project_id}/output/output.pdf"
+							url: "#{@settings.apis.clsi.url}/project/#{@project_id}/build/1234/output/output.pdf"
 							path: "output.pdf"
 							type: "pdf"
 							build: 1234
 						},{
-							url: "#{@settings.apis.clsi.url}/project/#{@project_id}/output/output.log"
+							url: "#{@settings.apis.clsi.url}/project/#{@project_id}/build/1234/output/output.log"
 							path: "output.log"
 							type: "log"
 							build: 1234
@@ -69,10 +69,12 @@ describe "ClsiManager", ->
 
 			it "should call the callback with the status and output files", ->
 				outputFiles = [{
+					url: "/project/#{@project_id}/build/1234/output/output.pdf"
 					path: "output.pdf"
 					type: "pdf"
 					build: 1234
 				},{
+					url: "/project/#{@project_id}/build/1234/output/output.log"
 					path: "output.log"
 					type: "log"
 					build: 1234