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

[17.09] Correct base route for workflows, allowing proxy-prefix to work. #4705

Merged

Conversation

Projects
None yet
6 participants
@dannon
Copy link
Member

commented Sep 27, 2017

WIP while I fix a few more of this same class of error.

This fixes the bug discussed in https://biostar.usegalaxy.org/p/24988/

@dannon dannon changed the base branch from dev to release_17.09 Sep 27, 2017

@dannon dannon changed the title Correct base route for workflows, allowing proxy-prefix to work. [17.09] Correct base route for workflows, allowing proxy-prefix to work. Sep 27, 2017

@jmchilton

This comment has been minimized.

Copy link
Member

commented Sep 27, 2017

... ... ... we should probably just run our Selenium test suite with a proxy-prefix on Jenkins when we run it huh?

@martenson

This comment has been minimized.

Copy link
Member

commented Sep 27, 2017

@jmchilton hell yeah

@dannon

This comment has been minimized.

Copy link
Member Author

commented Sep 27, 2017

I was working on refactoring a bit to have a single utils method for prepending the base URL (and ensuring Galaxy.root exists), but I'm going to pop that change over to dev instead.

@jmchilton jmchilton merged commit 7775d42 into galaxyproject:release_17.09 Sep 27, 2017

6 checks passed

api test Build finished. 292 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 161 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 46 tests run, 0 skipped, 0 failed.
Details
lgtm analysis: JavaScript No alert changes
Details
toolshed test Build finished. 579 tests run, 0 skipped, 0 failed.
Details
@jmchilton

This comment has been minimized.

Copy link
Member

commented Sep 27, 2017

@dannon Awesome - thanks for the fixes!

@galaxyproject galaxyproject deleted a comment from galaxybot Sep 27, 2017

@nsoranzo nsoranzo added this to the 17.09 milestone Sep 27, 2017

@nsoranzo nsoranzo added the area/UI-UX label Sep 27, 2017

@mandorodriguez

This comment has been minimized.

Copy link

commented Sep 27, 2017

Ok did a pull and the page with workflows works again. Thanks!

@dannon

This comment has been minimized.

Copy link
Member Author

commented Sep 27, 2017

@mandorodriguez Great! Happy to help.

@@ -185,7 +185,7 @@ $(document).ready( function() {
}

// Load all webhooks with the type 'onload'
$.getJSON('/api/webhooks/onload/all', function(webhooks) {
$.getJSON( Galaxy.root + '/api/webhooks/onload/all', function(webhooks) {

This comment has been minimized.

Copy link
@guerler

guerler Sep 27, 2017

Contributor

Should be api... instead of /api... right?

This comment has been minimized.

Copy link
@dannon

dannon Sep 27, 2017

Author Member

Both actually work, but I'd rolled that fix into my util function refactoring of this. If you want, I'll PR that change here for consistency.

This comment has been minimized.

Copy link
@dannon

dannon Sep 27, 2017

Author Member

(PR'd at #4715; might as well be consistent even with it being rewritten in -dev I guess)

@mandorodriguez

This comment has been minimized.

Copy link

commented Sep 29, 2017

Posted on biostars but guess I'll ask here too. My users existing workflows showed up after this but when she opens the workflow the sentence that is under the headings that explains what it is gone. Also names of the headings just say input where as before she had it say what it was (e.x reference genome). Is that text there and just not displaying?

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.