fix: preserve job order regarding when editing#704
Merged
RussH merged 3 commits intoopencats:masterfrom Apr 14, 2026
Merged
Conversation
anonymoususer72041
changed the title
anonymoususer72041
force-pushed
the
fix/activity-regarding
branch
3 times, most recently
from
2093dfa to
f3bf3fc
Compare
Member
|
@anonymoususer72041 Can you fix this so it's not breaking the CI tests? Can't Merge until then of course. |
anonymoususer72041
force-pushed
the
fix/activity-regarding
branch
from
f3bf3fc to
bdc02b7
Compare
Contributor
Author
Contributor
Author
|
After #735 was solved, I was able to successfully complete the testing, so I'm marking this PR as ready to review again. |
Member
|
Thank you for the PR - tested and merging. |
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.
This PR fixes an issue where editing an Activity could unintentionally reset the "Regarding" field from a specific Job Order to "General". The root cause was fragile preselection logic in the edit UI that relied on comparing rendered text, which could fail (for example when the dropdown option text includes markers like
(*)).The edit modal now preselects the correct Job Order using the underlying
jobOrderIDrather than display text. In addition, saving "General" is normalized so thatactivity.joborder_idis persisted as SQLNULLinstead of inconsistent sentinel values created by legacy paths (such as0or-1).Finally, the PR includes a schema migration that updates existing rows and converts legacy
activity.joborder_idvalues of0and-1toNULL, ensuring "General" is represented consistently across old and new data.