lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/release-8.0' into merge-release-8.0-into-dev-220906

Browse source
This commit is contained in:
Taranto 2022-06-09 23:56:40 +01:00
commit 4023470fec
47 changed files with 410 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/middlewares/operatorId.js
View file

@ -2,7 +2,7 @@ const { getOperatorId } = require('../operator')
function findOperatorId (req, res, next) {
return getOperatorId('middleware')
.then(({ operatorId }) => {
.then(operatorId => {
res.locals.operatorId = operatorId
return next()
})

2
lib/middlewares/populateSettings.js
View file

@ -46,7 +46,7 @@ function machineAction (type, value) {
}
function reload (operatorId) {
state.needsSettingsReload[operatorId.operatorId] = true
state.needsSettingsReload[operatorId] = true
}
const populateSettings = function (req, res, next) {