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

Revision of tool xml reloading feature #3596

Merged
merged 9 commits into from Feb 13, 2017

Conversation

Projects
None yet
2 participants
@guerler
Copy link
Contributor

commented Feb 11, 2017

This PR slightly revises the tool reload option in the tool form.

  1. The reload api endpoint now returns a dictionary instead of an HTML response, the admin controller mako has been modified to render HTML from that dictionary

  2. The api throws an exception if the tool is unavailable instead of returning status='error' through a success message

  3. The success/error message is shown for a few seconds in the tool forms message view instead of displaying a modal

  4. Styles are aligned to the tool form base class, and unused tooltips for dropdown items have been removed

form-screenshot

@blankenberg blankenberg changed the title Revision of tool xml reloading feature [WIP DEV] Revision of tool xml reloading feature Feb 12, 2017

@guerler

This comment has been minimized.

Copy link
Contributor Author

commented Feb 13, 2017

@galaxybot test this

@guerler guerler force-pushed the guerler:fix_tool_reload_003 branch from 0d640a9 to 73b8fc4 Feb 13, 2017

@guerler guerler added status/review and removed status/WIP labels Feb 13, 2017

@guerler guerler changed the title [WIP DEV] Revision of tool xml reloading feature Revision of tool xml reloading feature Feb 13, 2017

@dannon

This comment has been minimized.

Copy link
Member

commented Feb 13, 2017

Works great for me, merging locally to resolve conflicts.

@dannon dannon merged commit 73b8fc4 into galaxyproject:dev Feb 13, 2017

5 checks passed

api test Build finished. 263 tests run, 0 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 138 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 24 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 580 tests run, 0 skipped, 0 failed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.