Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Api link multiple #4203

Merged
merged 19 commits into from Oct 5, 2015
Merged

Api link multiple #4203

merged 19 commits into from Oct 5, 2015

Conversation

@will-moore
Copy link
Member

will-moore commented Sep 23, 2015

This improves performance of cut, copy & paste and drag 'n' drop actions in jsTree.
It makes a single AJAX call to create or delete multiple links for each action.
In each case, check that child counts are updated correctly and confirm the links have been created / deleted successfully by refreshing the tree.
Also check that the centre panel is correct and in sync with the tree.
Include cases where one or more of the children being moved is already contained in the destination parent.

Tests:

  • Drag and drop images, datasets & plates, moving from one parent to another in each case.
  • Copy and paste, as above.
  • Cut. Select a number of child nodes, some of which are also in other containers, others will become orphaned. Then Paste.

Any other actions you can think of?

@dominikl

This comment has been minimized.

Copy link
Member

dominikl commented Sep 24, 2015

Tested drag&drop of images, datasets and plates with firefox - works fine.

@dominikl

This comment has been minimized.

Copy link
Member

dominikl commented Sep 24, 2015

Tested copy, paste and cut as well - works fine.

I just noticed a behaviour I wasn't aware of: If I cut a dataset which is contained in one project only, it is moved to the parent folder (same is true for Insight). Guess that's expected, right?

@sbesson sbesson added the develop label Sep 24, 2015
@sbesson

This comment has been minimized.

Copy link
Member

sbesson commented Sep 28, 2015

@will-moore

This comment has been minimized.

Copy link
Member Author

will-moore commented Sep 28, 2015

Fixed 1 failing test - the others were due to #4208

@pwalczysko

This comment has been minimized.

Copy link
Member

pwalczysko commented Sep 28, 2015

The cut test performed on Win7 Chrome.
All went as expected.

request_url,
json.dumps(data),
content_type="application/json")
# Response will contain any remaing links from image

This comment has been minimized.

Copy link
@mtbc

mtbc Sep 29, 2015

Member

remaining

@mtbc

This comment has been minimized.

Copy link
Member

mtbc commented Sep 29, 2015

https://ci.openmicroscopy.org/job/OMERO-DEV-merge-robotframework/ is still failing; is that related? Otherwise, looks good to me!

@will-moore

This comment has been minimized.

Copy link
Member Author

will-moore commented Sep 29, 2015

@mtbc Thanks - No, those robot tests are unrelated to this PR. Fixed comment.

@mtbc

This comment has been minimized.

Copy link
Member

mtbc commented Sep 29, 2015

👍 As functional testing already done, once travis passes then good to merge.

@will-moore

This comment has been minimized.

Copy link
Member Author

will-moore commented Oct 1, 2015

Ticket created https://trac.openmicroscopy.org/ome/ticket/13049 as discussed with @joshmoore. Good to merge now I think.

@snoopycrimecop snoopycrimecop mentioned this pull request Oct 5, 2015
sbesson added a commit that referenced this pull request Oct 5, 2015
Api link multiple
@sbesson sbesson merged commit d35dac6 into ome:develop Oct 5, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@sbesson sbesson added this to the 5.2.0 milestone Oct 28, 2015
@will-moore will-moore deleted the will-moore:api_link_multiple branch Feb 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.