Skip to content
Snippets Groups Projects
Commit a7e621f5 authored by Sebastian Mihalache's avatar Sebastian Mihalache
Browse files

Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into develop

parents 0e96a3ca 965756d2
No related branches found
No related tags found
1 merge request!21Sprint #16 features
...@@ -66,6 +66,7 @@ module.exports = models => async (req, res) => { ...@@ -66,6 +66,7 @@ module.exports = models => async (req, res) => {
const user = await UserModel.find(invitation.userId) const user = await UserModel.find(invitation.userId)
user.teams = user.teams.filter(userTeamId => team.id !== userTeamId) user.teams = user.teams.filter(userTeamId => team.id !== userTeamId)
await user.save() await user.save()
await fragment.save()
const baseUrl = services.getBaseUrl(req) const baseUrl = services.getBaseUrl(req)
...@@ -79,7 +80,7 @@ module.exports = models => async (req, res) => { ...@@ -79,7 +80,7 @@ module.exports = models => async (req, res) => {
emailType: 'reviewer-cancel-invitation', emailType: 'reviewer-cancel-invitation',
}) })
return res.status(200).json({}) return res.status(200).json({ fragment })
} catch (e) { } catch (e) {
const notFoundError = await services.handleNotFoundError(e, 'collection') const notFoundError = await services.handleNotFoundError(e, 'collection')
return res.status(notFoundError.status).json({ return res.status(notFoundError.status).json({
......
...@@ -42,7 +42,7 @@ export default compose( ...@@ -42,7 +42,7 @@ export default compose(
.length .length
return ( return (
<ReviewerText> <ReviewerText>
Reviewer reports ({accepted}/{reviewerInvitations.length}) Reviewer invitations ({accepted}/{reviewerInvitations.length})
</ReviewerText> </ReviewerText>
) )
}, },
......
...@@ -105,6 +105,7 @@ const InviteReviewersModal = compose( ...@@ -105,6 +105,7 @@ const InviteReviewersModal = compose(
</Row> </Row>
<ReviewersList <ReviewersList
collectionId={collectionId} collectionId={collectionId}
getReviewers={getReviewers}
reviewers={reviewers} reviewers={reviewers}
showModal={showModal} showModal={showModal}
versionId={versionId} versionId={versionId}
......
...@@ -76,8 +76,10 @@ export default compose( ...@@ -76,8 +76,10 @@ export default compose(
showModal, showModal,
hideModal, hideModal,
versionId, versionId,
getReviewers,
collectionId, collectionId,
}) => () => { }) => () => {
getReviewers()
showModal({ showModal({
collectionId, collectionId,
type: 'invite-reviewers', type: 'invite-reviewers',
......
...@@ -47,6 +47,12 @@ function unauthenticatedUser(operation, object) { ...@@ -47,6 +47,12 @@ function unauthenticatedUser(operation, object) {
} }
} }
if (operation === 'PATCH') {
// let unauthorized reviewers decline the review invitation
if (get(object, 'type') === 'invitation') {
return true
}
}
return false return false
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment