mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-06-11 07:00:47 +02:00
Merge pull request #3495 from overleaf/ae-prettier-2
Upgrade Prettier to v2 GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
This commit is contained in:
@@ -19,34 +19,35 @@ const CSVParser = require('json2csv').Parser
|
||||
module.exports = {
|
||||
index(req, res, next) {
|
||||
const { entity, entityConfig } = req
|
||||
return entity.fetchV1Data(function(error, entity) {
|
||||
return entity.fetchV1Data(function (error, entity) {
|
||||
if (error != null) {
|
||||
return next(error)
|
||||
}
|
||||
return UserMembershipHandler.getUsers(entity, entityConfig, function(
|
||||
error,
|
||||
users
|
||||
) {
|
||||
let entityName
|
||||
if (error != null) {
|
||||
return next(error)
|
||||
return UserMembershipHandler.getUsers(
|
||||
entity,
|
||||
entityConfig,
|
||||
function (error, users) {
|
||||
let entityName
|
||||
if (error != null) {
|
||||
return next(error)
|
||||
}
|
||||
const entityPrimaryKey = entity[
|
||||
entityConfig.fields.primaryKey
|
||||
].toString()
|
||||
if (entityConfig.fields.name) {
|
||||
entityName = entity[entityConfig.fields.name]
|
||||
}
|
||||
return res.render('user_membership/index', {
|
||||
name: entityName,
|
||||
users,
|
||||
groupSize: entityConfig.hasMembersLimit
|
||||
? entity.membersLimit
|
||||
: undefined,
|
||||
translations: entityConfig.translations,
|
||||
paths: entityConfig.pathsFor(entityPrimaryKey)
|
||||
})
|
||||
}
|
||||
const entityPrimaryKey = entity[
|
||||
entityConfig.fields.primaryKey
|
||||
].toString()
|
||||
if (entityConfig.fields.name) {
|
||||
entityName = entity[entityConfig.fields.name]
|
||||
}
|
||||
return res.render('user_membership/index', {
|
||||
name: entityName,
|
||||
users,
|
||||
groupSize: entityConfig.hasMembersLimit
|
||||
? entity.membersLimit
|
||||
: undefined,
|
||||
translations: entityConfig.translations,
|
||||
paths: entityConfig.pathsFor(entityPrimaryKey)
|
||||
})
|
||||
})
|
||||
)
|
||||
})
|
||||
},
|
||||
|
||||
@@ -66,31 +67,33 @@ module.exports = {
|
||||
return next(new Errors.NotFoundError('Cannot add users to entity'))
|
||||
}
|
||||
|
||||
return UserMembershipHandler.addUser(entity, entityConfig, email, function(
|
||||
error,
|
||||
user
|
||||
) {
|
||||
if (error != null ? error.alreadyAdded : undefined) {
|
||||
return res.status(400).json({
|
||||
error: {
|
||||
code: 'user_already_added',
|
||||
message: req.i18n.translate('user_already_added')
|
||||
}
|
||||
})
|
||||
return UserMembershipHandler.addUser(
|
||||
entity,
|
||||
entityConfig,
|
||||
email,
|
||||
function (error, user) {
|
||||
if (error != null ? error.alreadyAdded : undefined) {
|
||||
return res.status(400).json({
|
||||
error: {
|
||||
code: 'user_already_added',
|
||||
message: req.i18n.translate('user_already_added')
|
||||
}
|
||||
})
|
||||
}
|
||||
if (error != null ? error.userNotFound : undefined) {
|
||||
return res.status(404).json({
|
||||
error: {
|
||||
code: 'user_not_found',
|
||||
message: req.i18n.translate('user_not_found')
|
||||
}
|
||||
})
|
||||
}
|
||||
if (error != null) {
|
||||
return next(error)
|
||||
}
|
||||
return res.json({ user })
|
||||
}
|
||||
if (error != null ? error.userNotFound : undefined) {
|
||||
return res.status(404).json({
|
||||
error: {
|
||||
code: 'user_not_found',
|
||||
message: req.i18n.translate('user_not_found')
|
||||
}
|
||||
})
|
||||
}
|
||||
if (error != null) {
|
||||
return next(error)
|
||||
}
|
||||
return res.json({ user })
|
||||
})
|
||||
)
|
||||
},
|
||||
|
||||
remove(req, res, next) {
|
||||
@@ -115,7 +118,7 @@ module.exports = {
|
||||
entity,
|
||||
entityConfig,
|
||||
userId,
|
||||
function(error, user) {
|
||||
function (error, user) {
|
||||
if (error != null ? error.isAdmin : undefined) {
|
||||
return res.status(400).json({
|
||||
error: {
|
||||
@@ -136,18 +139,19 @@ module.exports = {
|
||||
const { entity, entityConfig } = req
|
||||
const fields = ['email', 'last_logged_in_at']
|
||||
|
||||
return UserMembershipHandler.getUsers(entity, entityConfig, function(
|
||||
error,
|
||||
users
|
||||
) {
|
||||
if (error != null) {
|
||||
return next(error)
|
||||
return UserMembershipHandler.getUsers(
|
||||
entity,
|
||||
entityConfig,
|
||||
function (error, users) {
|
||||
if (error != null) {
|
||||
return next(error)
|
||||
}
|
||||
const csvParser = new CSVParser({ fields })
|
||||
res.header('Content-Disposition', 'attachment; filename=Group.csv')
|
||||
res.contentType('text/csv')
|
||||
return res.send(csvParser.parse(users))
|
||||
}
|
||||
const csvParser = new CSVParser({ fields })
|
||||
res.header('Content-Disposition', 'attachment; filename=Group.csv')
|
||||
res.contentType('text/csv')
|
||||
return res.send(csvParser.parse(users))
|
||||
})
|
||||
)
|
||||
},
|
||||
|
||||
new(req, res, next) {
|
||||
@@ -161,14 +165,15 @@ module.exports = {
|
||||
const entityId = req.params.id
|
||||
const entityConfig = req.entityConfig
|
||||
|
||||
return UserMembershipHandler.createEntity(entityId, entityConfig, function(
|
||||
error,
|
||||
entity
|
||||
) {
|
||||
if (error != null) {
|
||||
return next(error)
|
||||
return UserMembershipHandler.createEntity(
|
||||
entityId,
|
||||
entityConfig,
|
||||
function (error, entity) {
|
||||
if (error != null) {
|
||||
return next(error)
|
||||
}
|
||||
return res.redirect(entityConfig.pathsFor(entityId).index)
|
||||
}
|
||||
return res.redirect(entityConfig.pathsFor(entityId).index)
|
||||
})
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user