assist #9610: adjust rules for moving link children #3327
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
| @@ -96,7 +96,9 @@ private void moveImageWithNonSharedAnnotation(String src, String dest, | |||
| assertEquals(iQuery.findAllByQuery(sb.toString(), param).size(), | |||
| annotationIdsUser1.size()); | |||
| n = 0; | |||
| if (src.equals("rwrw--")) n = annotationIdsUser2.size(); | |||
| if (src.equals("rwrw--") && !dest.equals("rw----")) { | |||
There was a problem hiding this comment.
We do not expect to see another user's annotations once we have moved the image into a private group.
|
Tried to move entities tagged with owners tags (in ro) and other's tags (in ra) to another group. Works as expected. |
|
Waiting for integration tests builds to finish. |
|
I don't think anything in the current crop of failures points to chgrp. The tests referenced in this PR pass. |
|
*-integration-java is green https://ci.openmicroscopy.org/view/5.1/job/OMERO-5.1-merge-integration-java/ |
|
*-python tests are yellow with four failed tests, I have to rely on @mtbc when he says they have nothing to do with this PR. https://ci.openmicroscopy.org/view/5.1/job/OMERO-5.1-merge-integration-python/340/ All seems fine here. |
joshmoore
added a commit
that referenced
this pull request
Jan 13, 2015
assist #9610: adjust rules for moving link children
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.
Marks three integration tests as no longer broken. Integration tests should still pass. Could look for regressions regarding moving images that have owner's and others' comments and tags between groups.
--no-rebase