[Bugfix:TAGrading] Fix Team Version Conflict Handling#13036
Merged
Conversation
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #13036 +/- ##
=========================================
Coverage 21.09% 21.09%
Complexity 10115 10115
=========================================
Files 279 279
Lines 38167 38167
Branches 585 585
=========================================
Hits 8051 8051
Misses 29544 29544
Partials 572 572
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
roye2
approved these changes
Jul 15, 2026
roye2
left a comment
roye2
left a comment
Contributor
There was a problem hiding this comment.
I tested this and was able to reproduce the original error. Upon switching to the branch the error was resolved and clear version conflicts worked as intended. Additionally, I verified that the feature still works for non-team submissions. The code also looks good, so I approve.
github-project-automation
Bot
moved this from Seeking Reviewer
to Awaiting Maintainer Review
in Submitty Development
bmcutler
requested changes
Jul 15, 2026
bmcutler
left a comment
bmcutler
left a comment
Member
There was a problem hiding this comment.
i think we discussed/agreed that a CI test will be added to this PR before this is merged
github-project-automation
Bot
moved this from Awaiting Maintainer Review
to Work in Progress
in Submitty Development
bmcutler
approved these changes
Jul 15, 2026
github-project-automation
Bot
moved this from Work in Progress
to Awaiting Maintainer Review
in Submitty Development
github-project-automation
Bot
moved this from Awaiting Maintainer Review
to Done
in Submitty Development
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why is this Change Important & Necessary?
Partially Addresses #13033
Clicking Clear Version Conflicts did not work for team gradeables. This was due to the database query for changing graded versions searched by user_id, but team gradeable components go by team_id.
What is the New Behavior?
The database query for changing graded versions for components now searches by both user_id and team_id so all version conflicts are caught.
What steps should a reviewer take to reproduce or test the bug or new feature?
Automated Testing & Documentation
No automated testing added
Other information
Not a breaking change
No migrations
Not a security concern