github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-06 08:03:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use lowercase project_id

Browse source
This commit is contained in:
Shane Kilkelly 2017-06-12 11:37:05 +01:00
parent c9432a1238
commit 9f9468d0e0
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/coffee/Features/Labels/LabelsController.coffee
View file

@ -6,7 +6,7 @@ logger = require 'logger-sharelatex'
module.exports = LabelsController =
getAllLabels: (req, res, next) ->
project_id = req.params.Project_id
project_id = req.params.project_id
LabelsHandler.getAllLabelsForProject project_id, (err, projectLabels) ->
if err?
logger.err {project_id, err}, "[LabelsController] error getting all labels from project"
@ -14,7 +14,7 @@ module.exports = LabelsController =
res.json {projectId: project_id, projectLabels: projectLabels}
getLabelsForDoc: (req, res, next) ->
project_id = req.params.Project_id
project_id = req.params.project_id
doc_id = req.params.doc_id
LabelsHandler.getLabelsForDoc project_id, doc_id, (err, docLabels) ->
if err?

4
services/web/app/coffee/router.coffee
View file

@ -194,8 +194,8 @@ module.exports = class Router
webRouter.get '/Project/:Project_id/download/zip', AuthorizationMiddlewear.ensureUserCanReadProject, ProjectDownloadsController.downloadProject
webRouter.get '/project/download/zip', AuthorizationMiddlewear.ensureUserCanReadMultipleProjects, ProjectDownloadsController.downloadMultipleProjects
webRouter.get '/project/:Project_id/labels', AuthorizationMiddlewear.ensureUserCanReadProject, AuthenticationController.requireLogin(), LabelsController.getAllLabels
webRouter.get '/project/:Project_id/:doc_id/labels', AuthorizationMiddlewear.ensureUserCanReadProject, AuthenticationController.requireLogin(), LabelsController.getLabelsForDoc
webRouter.get '/project/:project_id/labels', AuthorizationMiddlewear.ensureUserCanReadProject, AuthenticationController.requireLogin(), LabelsController.getAllLabels
webRouter.get '/project/:project_id/:doc_id/labels', AuthorizationMiddlewear.ensureUserCanReadProject, AuthenticationController.requireLogin(), LabelsController.getLabelsForDoc
webRouter.get '/tag', AuthenticationController.requireLogin(), TagsController.getAllTags
webRouter.post '/tag', AuthenticationController.requireLogin(), TagsController.createTag

8
services/web/test/UnitTests/coffee/Labels/LabelsControllerTests.coffee
View file

@ -25,7 +25,7 @@ describe 'LabelsController', ->
beforeEach ->
@fakeLabels = {'somedoc': ['a_label']}
@LabelsHandler.getAllLabelsForProject = sinon.stub().callsArgWith(1, null, @fakeLabels)
@req = {params: {Project_id: @projectId}}
@req = {params: {project_id: @projectId}}
@res = {json: sinon.stub()}
@next = sinon.stub()
@ -46,7 +46,7 @@ describe 'LabelsController', ->
describe 'when LabelsHandler.getAllLabelsForProject produces an error', ->
beforeEach ->
@LabelsHandler.getAllLabelsForProject = sinon.stub().callsArgWith(1, new Error('woops'))
@req = {params: {Project_id: @projectId}}
@req = {params: {project_id: @projectId}}
@res = {json: sinon.stub()}
@next = sinon.stub()
@ -69,7 +69,7 @@ describe 'LabelsController', ->
@LabelsHandler.getLabelsForDoc = sinon.stub().callsArgWith(2, null, @fakeLabels)
@EditorRealTimeController.emitToRoom = sinon.stub()
@docId = 'somedoc'
@req = {params: {Project_id: @projectId, doc_id: @docId}}
@req = {params: {project_id: @projectId, doc_id: @docId}}
@res = {json: sinon.stub()}
@next = sinon.stub()
@ -100,7 +100,7 @@ describe 'LabelsController', ->
@LabelsHandler.getLabelsForDoc = sinon.stub().callsArgWith(2, new Error('woops'))
@EditorRealTimeController.emitToRoom = sinon.stub()
@docId = 'somedoc'
@req = {params: {Project_id: @projectId, doc_id: @docId}}
@req = {params: {project_id: @projectId, doc_id: @docId}}
@res = {json: sinon.stub()}
@next = sinon.stub()