Merge pull request #3610 from dannon/fix-editor-save-as-url

[17.01] Fix workflow save-as url not using galaxy's prefix.
This commit is contained in:
Eric Rasche
2017-02-14 14:33:07 +00:00
committed by GitHub
5 changed files with 7 additions and 7 deletions
@@ -424,7 +424,7 @@ EditorFormView = Backbone.View.extend({
}
}).done(function(id){
window.onbeforeunload = undefined;
window.location = "/workflow/editor?id=" + id;
window.location = Galaxy.root + "workflow/editor?id=" + id;
hide_modal();
}).fail(function(){
hide_modal();
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -13,10 +13,10 @@
'run_workflow' : h.url_for( controller='root', action='index', workflow_id=trans.security.encode_id(stored.id)),
'rename_async' : h.url_for( controller='workflow', action='rename_async', id=trans.security.encode_id(stored.id) ),
'annotate_async' : h.url_for( controller='workflow', action='annotate_async', id=trans.security.encode_id(stored.id) ),
'get_new_module_info' : h.url_for(controller='workflow', action='get_new_module_info' ),
'get_new_module_info' : h.url_for( controller='workflow', action='get_new_module_info' ),
'workflow_index' : h.url_for( controller='workflow', action='index' ),
'save_workflow' : h.url_for(controller='workflow', action='save_workflow' ),
'workflow_save_as' : h.url_for(controller='workflow', action='save_workflow_as')
'save_workflow' : h.url_for( controller='workflow', action='save_workflow' ),
'workflow_save_as' : h.url_for( controller='workflow', action='save_workflow_as')
},
'workflows' : [{
'id' : trans.security.encode_id( workflow.id ),