Paths to object well image fix (rebased onto metadata52)#4934
Merged
joshmoore merged 3 commits intoome:metadata52from Nov 11, 2016
atarkowska:rebased/metadata52/paths_to_object_wellImage_fix
Merged
Paths to object well image fix (rebased onto metadata52)#4934joshmoore merged 3 commits intoome:metadata52from atarkowska:rebased/metadata52/paths_to_object_wellImage_fix
joshmoore merged 3 commits intoome:metadata52from
atarkowska:rebased/metadata52/paths_to_object_wellImage_fix
Conversation
Member
Author
|
--rebased-from #4933 |
Member
|
Merging based on #4933 (comment) |
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.
This is the same as gh-4933 but rebased onto metadata52.
What this PR does
This fixes a bug found during IDR testing today and reproduced on develop:
https://www.openmicroscopy.org/qa2/qa/feedback/17421/
Introduced in #4774
To reproduce / test:
webclient/paths_to_object/?image=IDwhich previously failed if the image is in a Well (not orphaned) AND there are more than 1 page of orphaned images.webclient/paths_to_object/?image=IDfor the Image in Well returns json that includes the WellIDCheck that orphaned pagination still works
webclient/paths_to_object/?image=IDfor this image has correct pagination details returned.The bug was because we try to find the index of orphaned image in list of ALL orphaned images (to know which page it is on) BEFORE checking whether the image is in a Well.
This was also very slow on IDR because it has > 10,000 orphaned images.
Now, we only try to load ALL orphaned images to find page AFTER we've checked to see if image is in a Well.
cc @joshmoore @aleksandra-tarkowska @manics