Explorar el Código

put the build id in the output file urls

the url attribute will now give the preferred location for accessing
the output file, without the url having to be constructed by the web
client
Brian Gough hace 10 años
padre
commit
bd22a6e02d

+ 4 - 1
services/clsi/app/coffee/CompileController.coffee

@@ -33,7 +33,10 @@ module.exports = CompileController =
 							status: status
 							error:  error?.message or error
 							outputFiles: outputFiles.map (file) ->
-								url: "#{Settings.apis.clsi.url}/project/#{request.project_id}/output/#{file.path}"
+								url:
+									"#{Settings.apis.clsi.url}/project/#{request.project_id}" +
+									(if file.build? then "/build/#{file.build}" else "") +
+									"/output/#{file.path}"
 								path: file.path
 								type: file.type
 								build: file.build

+ 1 - 1
services/clsi/test/unit/coffee/CompileControllerTests.coffee

@@ -75,7 +75,7 @@ describe "CompileController", ->
 							status: "success"
 							error: null
 							outputFiles: @output_files.map (file) =>
-								url: "#{@Settings.apis.clsi.url}/project/#{@project_id}/output/#{file.path}"
+								url: "#{@Settings.apis.clsi.url}/project/#{@project_id}/build/#{file.build}/output/#{file.path}"
 								path: file.path
 								type: file.type
 								build: file.build