[Conflict Resolver] remove date to array conversion #2885
Merged
Conversation
This file contains 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
davidblader
added
the
Bug
johnsaigle
approved these changes
Jun 15, 2017
I think CCNA would definitely prefer to have this on the sooner side; I'll put the needs discussion label on it |
davidblader
added
the
Discussion Required
|
@johnsaigle @davidblader this is definitely 17.0 !! IBIS is overriding CCNA will be doing so as well so we need the fix asap |
ridz1208
removed
the
Discussion Required
|
@davidblader @mohadesz Tested a couple of date conflicts in conflict resolver. The date conflicts can be saved/resolved. |
sruthymathew123
added
the
Passed Manual Tests
johnsaigle
moved this from Needs Testing
to Needs Senior Developer Review And Senior Developer Should Merge If Everything Is Fine So There's No Further States
in Code review 18.1
driusan
removed this from Needs Senior Developer Review And Senior Developer Should Merge If Everything Is Fine So There's No Further States
in Code review 18.1
jstirling91
pushed a commit
to jstirling91/Loris
that referenced
this pull request
Jun 21, 2017
Fix bug where conflict resolver was using an old quickform style date-to-array conversion, instead of directly using the HTML5 date which is passed to LORIS.
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.
converting date string to array causes Utility::calculateAge to throw the following error
when attempting to resolve conflicts for the Date_taken field
https://redmine.cbrain.mcgill.ca/issues/12659