Repository navigation
Fix bonus calculation crash and time entry form responses - #79
Open
travismolick wants to merge 2 commits into
Open
travismolick wants to merge 2 commits into
travismolick wants to merge 2 commits into
Conversation
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
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.
Fixes two bugs found while writing the tests in #78:
TimeEntry::calculateBonusTime()crashed with "Attempt to read property "department_id" on null" when called without preloaded bonuses. In that case it queries the bonuses itself, already filtered by department, so they have no pivot. It now checks the pivot only when there is one. Nothing in the app calls it that way today, so this prevents a future crash rather than fixing a live one.VolunteerController::storeTimeEntry()anddestroyTimeEntry()were declared to returnJsonResponse, but return a redirect for non-JSON requests, so form submits threw a TypeError (500). The return types now allowRedirectResponse.Each fix has a test (
TimeEntryBonusTest,TimeEntryFormRedirectTest) that fails without it.