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

Django upgrade follow up #4277

Merged
merged 5 commits into from Oct 21, 2015
Merged

Django upgrade follow up #4277

merged 5 commits into from Oct 21, 2015

Conversation

atarkowska
Copy link
Member

This is #4236 follow up PR. It fixes:

Testing servers: cowfish/integration and eel/merge

To test:

@atarkowska atarkowska changed the title Django followup Django upgrade - user form Oct 17, 2015
@atarkowska atarkowska changed the title Django upgrade - user form Django upgrade follow up Oct 17, 2015
@jburel
Copy link
Member

jburel commented Oct 18, 2015

@aleksandra-tarkowska: travis restarted

@pwalczysko
Copy link
Member

One more ToTest: Double-check that the Save to All problem is really gone (today's testing indicates it is gone on http://eel.openmicroscopy.org/merge/webclient/?show=dataset-2401 user-1 as well as on the leica-original 56 strong MIF - all tests passed there).

@pwalczysko
Copy link
Member

The admin form is okay on cowfish and eel.

@pwalczysko
Copy link
Member

Save to All works in both servers and in all situations.

@pwalczysko
Copy link
Member

Annotations in right-hand pane as expected

  • cowfish
  • eel
  • single selection
  • mulitselection

@pwalczysko
Copy link
Member

All works except the Secret key part - to be discussed betw. @aleksandra-tarkowska and @joshmoore

@atarkowska
Copy link
Member Author

as discussed with @joshmoore secret key will go to web plugin. This will happen in a separate PR to not block changes

@pwalczysko
Copy link
Member

Experimenter fields in the right order:

  • eel okay
  • cowfish okay

Annotations forms single and multiselection:

  • eel okay
  • cowfish okay

Ready to merge.

sbesson added a commit that referenced this pull request Oct 21, 2015
@sbesson sbesson merged commit 30695c5 into ome:develop Oct 21, 2015
@sbesson sbesson added this to the 5.2.0 milestone Oct 28, 2015
@atarkowska atarkowska deleted the django_followup branch October 30, 2015 23:02
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.

None yet

4 participants