Craftadoc/clsi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

put the build id in the output file urls

Browse Source 
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
This commit is contained in:
Brian Gough
2016-05-27 15:25:13 +01:00
parent ac3b7a571a
commit 78b88683fc
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/coffee/CompileController.coffee
View File

@@ -33,7 +33,10 @@ module.exports = CompileController =
status: status status: status
error: error?.message or error error: error?.message or error
outputFiles: outputFiles.map (file) -> 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 path: file.path
type: file.type type: file.type
build: file.build build: file.build

2
test/unit/coffee/CompileControllerTests.coffee
View File

@@ -75,7 +75,7 @@ describe "CompileController", ->
status: "success" status: "success"
error: null error: null
outputFiles: @output_files.map (file) => 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 path: file.path
type: file.type type: file.type
build: file.build build: file.build