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

Ajax content type 11821 #1900

Merged
merged 3 commits into from
Dec 16, 2013
Merged

Conversation

will-moore
Copy link
Member

Seems that Django 1.6 is a bit more picky about parsing REQUEST data from jQuery AJAX calls, resulting in a couple of bugs http://trac.openmicroscopy.org.uk/ome/ticket/11819 and http://trac.openmicroscopy.org.uk/ome/ticket/11821

Solution is to remove 'contentType' from jQuery AJAX requests.

To test:

  • Add a Tag to an Image, then click the X on the tag to remove it from the Image.
  • Select several images and add to the Basket. Then go to the basket, select a couple and Remove from basket.
  • Also check that deleting a File attached to a P/D/I still works (delete not remove) - regression test.

--no-rebase - Only needed for Django 1.6

@mtbc
Copy link
Member

mtbc commented Dec 16, 2013

Seems to work fine, good to merge.

joshmoore added a commit that referenced this pull request Dec 16, 2013
@joshmoore joshmoore merged commit a66696e into ome:develop Dec 16, 2013
@will-moore will-moore deleted the ajax_contentType_11821 branch January 23, 2014 10:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants