Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[conflict_resolver] Add Cohort filter and field #9407

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 1 commit into from
Oct 30, 2024
Merged

[conflict_resolver] Add Cohort filter and field #9407

driusan merged 1 commit into from
Oct 30, 2024

Conversation

@victori444
Copy link
Contributor

@victori444 victori444 commented Oct 11, 2024 •
edited
Loading

Brief summary of changes

Adds a 'Cohort' filter and field to both unresolved and resolved tabs of the conflict resolver

Testing instructions (if applicable)

In the Unresolved & Resolved tabs:

  1. In the Selection filter, verify that the 'Cohort' filter exists and has the appropriate options in the dropdown
  2. Check that the 'Cohort' field appears as a column
  3. Select any option and check that only conflicts of that cohort appear

CCNA Override

@driusan
Copy link
Collaborator

driusan commented Oct 29, 2024

@kongtiaowang can you review/test this?

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 3c1baff into aces:main Oct 30, 2024
ZhichGaming pushed a commit to ZhichGaming/Loris that referenced this pull request Nov 25, 2024
@victori444 @ZhichGaming
[conflict_resolver] Add Cohort filter and field (aces#9407)
a501784 
Adds a 'Cohort' filter and field to both unresolved and resolved tabs of
the conflict resolver
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

@victori444 @driusan @kongtiaowang