Skip to content

Commit 7080f2c

Browse files
author
Vikas Agarwal
committed
Github issue#2813, Spurious project members are available in the allowed users dropdown
— Fixed
1 parent b9b838e commit 7080f2c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/projects/detail/components/FileListContainer.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,10 @@ const mapDispatchToProps = {
110110
}
111111

112112
const mapStateToProps = ({ members, projectState, loadUser }) => {
113+
const project = projectState.project
114+
let projectMembers = _.filter(members.members, m => _.some(project.members, pm => pm.userId === m.userId))
113115
return {
114-
allMembers: members.members,
116+
allMembers: _.keyBy(projectMembers, 'userId'),
115117
pendingAttachments: projectState.attachmentsAwaitingPermission,
116118
attachmentPermissions: projectState.attachmentPermissions,
117119
loggedInUser: loadUser.user,

src/projects/detail/containers/ProjectInfoContainer.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,11 +315,13 @@ ProjectInfoContainer.PropTypes = {
315315
}
316316

317317
const mapStateToProps = ({ templates, projectState, members, loadUser }) => {
318+
const project = projectState.project
319+
const projectMembers = _.filter(members.members, m => _.some(project.members, pm => pm.userId === m.userId))
318320
return ({
319321
projectTemplates : templates.projectTemplates,
320322
attachmentsAwaitingPermission: projectState.attachmentsAwaitingPermission,
321323
attachmentPermissions: projectState.attachmentPermissions,
322-
projectMembers: members.members,
324+
projectMembers: _.keyBy(projectMembers, 'userId'),
323325
loggedInUser: loadUser.user
324326
})
325327
}

0 commit comments

Comments
 (0)