Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display consents in person merge view #2370

Closed
elichad opened this issue Apr 3, 2023 · 2 comments · Fixed by #2376
Closed

Display consents in person merge view #2370

elichad opened this issue Apr 3, 2023 · 2 comments · Fixed by #2376
Assignees
@elichad
Labels
component: user interface (UI) type: bug
Milestone
v4.1

Comments

@elichad
Copy link
Contributor

elichad commented Apr 3, 2023

When merging two Persons, their consents don't display correctly in the merge view (but are still merged). We could copy what has been written for the training requests merge view:
https://github.com/carpentries/amy/pull/2363/files#diff-28b075b2b3e469ffbc4023daeb7f657ce17236f815f3aebfe1f64c8783d2d60cR955
https://github.com/carpentries/amy/pull/2363/files#diff-db895696b527b478871dcb468a1b1d3a896d565667ab30f6e1cf1a9150c18783R234
@pbanaszkiewicz
Copy link
Contributor

Also remove "Combine" option from person merging for consents

@pbanaszkiewicz pbanaszkiewicz added this to the v4.1 milestone Apr 3, 2023
@elichad elichad mentioned this issue Apr 3, 2023
Merged
6 tasks
@elichad elichad assigned elichad and unassigned elichad Apr 5, 2023
pbanaszkiewicz added a commit that referenced this issue Apr 7, 2023
@pbanaszkiewicz
[#2370] Merging persons: display & merge consents
fb6f8cb
pbanaszkiewicz added a commit that referenced this issue Apr 7, 2023
@pbanaszkiewicz
[#2370] Remove unused util
5f6f81d
@pbanaszkiewicz pbanaszkiewicz mentioned this issue Apr 7, 2023
Merged
@elichad elichad self-assigned this Apr 11, 2023
pbanaszkiewicz added a commit that referenced this issue Apr 16, 2023
@pbanaszkiewicz
[#2370] Merging persons: display & merge consents
6a59289
pbanaszkiewicz added a commit that referenced this issue Apr 16, 2023
@pbanaszkiewicz
[#2370] Remove unused util
9e9231b
pbanaszkiewicz added a commit that referenced this issue Apr 16, 2023
@pbanaszkiewicz
[#2370] Display single option for merging person consents
50aa762 
New option is to use the most recent consents available
pbanaszkiewicz added a commit that referenced this issue Apr 16, 2023
@pbanaszkiewicz
[#2370] Fix displaying consents when merging persons
01ac174 
We need the active consents, nothing else.
pbanaszkiewicz added a commit that referenced this issue Apr 16, 2023
@pbanaszkiewicz
[#2370] Bring back archive_least_recent_active_consents
f576e49
@maneesha
Copy link
Contributor

Leaving note here that we decided that we would use the most recent consent when merging.

pbanaszkiewicz added a commit that referenced this issue Apr 21, 2023
@pbanaszkiewicz
[#2370] Test merging consents with "most recent" strategy
6e13915
@maneesha maneesha mentioned this issue Dec 11, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@elichad elichad

Labels
component: user interface (UI) type: bug
Projects
None yet
Milestone
v4.1
Development

Successfully merging a pull request may close this issue.

Display person consents when merging carpentries/amy
3 participants
@pbanaszkiewicz @maneesha @elichad