Skip to content

[Conflict_resolver] Show examiner name #9404

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
Merged
driusan merged 2 commits into from
Oct 30, 2024
Merged

[Conflict_resolver] Show examiner name #9404

driusan merged 2 commits into from
Oct 30, 2024

Conversation

@skarya22
Copy link
Contributor

@skarya22 skarya22 commented Oct 10, 2024

Brief summary of changes

  • Show the examiner name in the conflict resolver as well as the ID, as just the ID makes it difficult for users.
  • This was previously done as well but the change was likely lost in the shuffle

Testing instructions (if applicable)

  1. create a data entry conflict for the Examiner field if your DB does not have any already
  2. see that the conflict has the examiner names and not just the ID
  3. resolve Examiner conflict & make sure examiner name is there as well
  4. check respective instrument table that ExaminerID is valid for the resolved conflict
  5. comment "Good job, Saagar! 🍻" and approve PR

CCNA OVERRIDE PR

@kongtiaowang
Copy link
Contributor

kongtiaowang commented Oct 30, 2024

截屏2024-10-30 下午2 31 07 截屏2024-10-30 下午2 31 32 Good job, Saagar!!!!!

kongtiaowang
kongtiaowang approved these changes Oct 30, 2024
View reviewed changes
Copy link
Contributor

@kongtiaowang kongtiaowang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kongtiaowang kongtiaowang added the Passed manual tests PR has been successfully tested by at least one peer label Oct 30, 2024
@driusan driusan merged commit a32d217 into aces:main Oct 30, 2024
ZhichGaming pushed a commit to ZhichGaming/Loris that referenced this pull request Nov 25, 2024
@skarya22 @ZhichGaming
[Conflict_resolver] Show examiner name (aces#9404)
23949c3 
- Show the examiner name in the conflict resolver as well as the ID, as
just the ID makes it difficult for users.
- This was previously done in PR#2891 as well but the change was lost at
   some point.
@driusan driusan mentioned this pull request Jan 21, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kongtiaowang kongtiaowang kongtiaowang approved these changes

Assignees

@kongtiaowang kongtiaowang

Labels

Passed manual tests PR has been successfully tested by at least one peer

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@skarya22 @kongtiaowang @driusan