Merge pull request galaxyproject#2622 from guerler/internal_api

Reroute consistent workflow endpoint to internal api
mariabernard · Jul 18, 2016 · d351121 · d351121
2 parents e21a81f + 9e07774
commit d351121
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/client/galaxy/scripts/mvc/tool/tool-form-composite.js b/client/galaxy/scripts/mvc/tool/tool-form-composite.js
@@ -372,7 +372,7 @@ define([ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view'
                 Galaxy.emit.debug( 'tool-form-composite::submit()', 'Validation complete.', job_def );
                 Utils.request({
                     type    : 'POST',
-                    url     : Galaxy.root + 'api/workflows/' + this.model.id + '/run',
+                    url     : Galaxy.root + 'api_internal/workflows/' + this.model.id + '/run',
                     data    : job_def,
                     success : function( response ) {
                         Galaxy.emit.debug( 'tool-form-composite::submit', 'Submission successful.', response );
@@ -477,4 +477,4 @@ define([ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view'
     return {
         View: View
     };
-});
+});
diff --git a/lib/galaxy/webapps/galaxy/api/workflows.py b/lib/galaxy/webapps/galaxy/api/workflows.py
@@ -88,7 +88,7 @@ def show(self, trans, id, **kwd):
     @expose_api
     def run( self, trans, workflow_id, payload, **kwd ):
         """
-        POST /api/workflows/{encoded_workflow_id}/run
+        POST /api_internal/workflows/{encoded_workflow_id}/run
 
         Run a workflow with a dictionary of prefixed_name/value pairs e.g.
             payload = { inputs: { step_0: { parameter_0|parameter_1 : value_0, ... }, ... } }

diff --git a/lib/galaxy/webapps/galaxy/buildapp.py b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -271,7 +271,7 @@ def populate_api_routes( webapp, app ):
     webapp.mapper.resource( 'genome', 'genomes', path_prefix='/api' )
     webapp.mapper.resource( 'visualization', 'visualizations', path_prefix='/api' )
     webapp.mapper.connect( '/api/workflows/build_module', action='build_module', controller="workflows" )
-    webapp.mapper.connect( '/api/workflows/{workflow_id}/run', action='run', controller="workflows", conditions=dict( method=['POST'] ) )
+    webapp.mapper.connect( '/api_internal/workflows/{workflow_id}/run', action='run', controller="workflows", conditions=dict( method=['POST'] ) )
     webapp.mapper.resource( 'workflow', 'workflows', path_prefix='/api' )
     webapp.mapper.resource_with_deleted( 'history', 'histories', path_prefix='/api' )
     webapp.mapper.connect( '/api/histories/{history_id}/citations', action='citations', controller="histories" )

diff --git a/static/maps/mvc/tool/tool-form-composite.js.map b/static/maps/mvc/tool/tool-form-composite.js.map
diff --git a/static/scripts/bundled/analysis.bundled.js b/static/scripts/bundled/analysis.bundled.js
diff --git a/static/scripts/bundled/analysis.bundled.js.map b/static/scripts/bundled/analysis.bundled.js.map
diff --git a/static/scripts/bundled/libs.bundled.js b/static/scripts/bundled/libs.bundled.js
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/mvc/tool/tool-form-composite.js b/static/scripts/mvc/tool/tool-form-composite.js