Commit c151a90e authored by Audrey Hamelers's avatar Audrey Hamelers

#476 result whole user, not just ID

parent 90424268
Pipeline #12968 passed with stages
in 3 minutes and 25 seconds
......@@ -13,6 +13,7 @@ const Result = styled.div`
display: flex;
align-items: center;
justify-content: space-between;
flex-wrap: wrap;
& > * {
margin: ${th('gridUnit')};
}
......@@ -84,7 +85,7 @@ class UserIdSearch extends React.Component {
<span>{`${title ? `${title} ` : ''}${givenNames} ${surname}`}</span>
<span>{email}</span>
<div>
<Button onClick={() => this.props.success(result.id)} primary>
<Button onClick={() => this.props.success(result)} primary>
{this.props.successLabel}
</Button>
<Button onClick={() => this.setState({ result: null })}>
......
......@@ -63,7 +63,7 @@ class MergeAccount extends React.Component {
{success && <Notification type="success">{success}</Notification>}
{error && <Notification type="error">{error}</Notification>}
<UserIdSearch
success={v => this.setState({ mergeId: v, isOpen: !isOpen })}
success={v => this.setState({ mergeId: v.id, isOpen: !isOpen })}
successLabel="Merge"
/>
<ConfirmDialog
......
Markdown is supported
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