use build_id and user_id instead of build and user

This commit is contained in:
Brian Gough 2016-06-02 17:03:07 +01:00
parent 634c774592
commit e6dcce21fd
2 changed files with 9 additions and 9 deletions

View file

@ -104,12 +104,12 @@ module.exports = CompileController =
getFileFromClsi: (req, res, next = (error) ->) ->
project_id = req.params.Project_id
build = req.params.build
user = req.params.user
if user? and build?
url = "/project/#{project_id}/user/#{user}/build/#{build}/output/#{req.params.file}"
else if build?
url = "/project/#{project_id}/build/#{build}/output/#{req.params.file}"
build_id = req.params.build_id
user_id = req.params.user_id
if user_id? and build_id?
url = "/project/#{project_id}/user/#{user_id}/build/#{build_id}/output/#{req.params.file}"
else if build_id?
url = "/project/#{project_id}/build/#{build_id}/output/#{req.params.file}"
else
url = "/project/#{project_id}/output/#{req.params.file}"
CompileController.proxyToClsi(project_id, url, req, res, next)

View file

@ -118,7 +118,7 @@ module.exports = class Router
((req, res, next) ->
params =
"Project_id": req.params[0]
"build": req.params[1]
"build_id": req.params[1]
"file": req.params[2]
req.params = params
next()
@ -129,8 +129,8 @@ module.exports = class Router
((req, res, next) ->
params =
"Project_id": req.params[0]
"user": req.params[1]
"build": req.params[2]
"user_id": req.params[1]
"build_id": req.params[2]
"file": req.params[3]
req.params = params
next()