3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/d024cb15459d/ changeset: d024cb15459d user: Kyle Ellrott date: 2013-02-26 01:48:38 summary: Passing extra parameters from root index to tool index. This will allow for tools to pick up parameters from the request URL and map them with the request_param_translation, even when inside the root frame. affected #: 2 files diff -r 26d7b89d9f897a28876214c88faed215973e6fcd -r d024cb15459def8c539b3b894eeac94b6bd95ca3 lib/galaxy/webapps/galaxy/controllers/root.py --- a/lib/galaxy/webapps/galaxy/controllers/root.py +++ b/lib/galaxy/webapps/galaxy/controllers/root.py @@ -22,7 +22,8 @@ return trans.fill_template( "root/index.mako", tool_id=tool_id, workflow_id=workflow_id, - m_c=m_c, m_a=m_a ) + m_c=m_c, m_a=m_a, + params=kwd ) ## ---- Tool related ----------------------------------------------------- diff -r 26d7b89d9f897a28876214c88faed215973e6fcd -r d024cb15459def8c539b3b894eeac94b6bd95ca3 templates/webapps/galaxy/root/index.mako --- a/templates/webapps/galaxy/root/index.mako +++ b/templates/webapps/galaxy/root/index.mako @@ -118,7 +118,7 @@ if trans.app.config.require_login and not trans.user: center_url = h.url_for( controller='user', action='login' ) elif tool_id is not None: - center_url = h.url_for( 'tool_runner', tool_id=tool_id, from_noframe=True ) + center_url = h.url_for( 'tool_runner', tool_id=tool_id, from_noframe=True, **params ) elif workflow_id is not None: center_url = h.url_for( controller='workflow', action='run', id=workflow_id ) elif m_c is not None: https://bitbucket.org/galaxy/galaxy-central/commits/9fca1c2e2b5d/ changeset: 9fca1c2e2b5d user: Kyle Ellrott date: 2013-02-26 20:09:44 summary: For external tool requests, without a 'URL' parameter but with other parameters, still process the incoming parameters. This will allow for tools that have 'request_param_translation' tables without the 'URL' parameter mapping to accept external requests and fill in their tool form page. affected #: 1 file diff -r d024cb15459def8c539b3b894eeac94b6bd95ca3 -r 9fca1c2e2b5db9853db093c241276c5431355b98 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -1809,6 +1809,8 @@ if "runtool_btn" not in incoming and "URL" not in incoming: if not self.display_interface: return 'message.mako', dict( status='info', message="The interface for this tool cannot be displayed", refresh_frames=['everything'] ) + if len(incoming): + self.update_state( trans, self.inputs_by_page[state.page], state.inputs, incoming, old_errors=old_errors or {} ) return "tool_form.mako", dict( errors={}, tool_state=state, param_values={}, incoming={} ) # Process incoming data if not( self.check_values ): https://bitbucket.org/galaxy/galaxy-central/commits/7fe3612562ee/ changeset: 7fe3612562ee user: dannon date: 2013-03-08 16:35:38 summary: Merged in kellrott/galaxy-central (pull request #130) Passing extra parameters from root index to tool index. affected #: 3 files diff -r c7bde6953174eabe5510c89d023ffd8232592f11 -r 7fe3612562eea76387e88ab7d184fccc3160cb43 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -1922,6 +1922,8 @@ if "runtool_btn" not in incoming and "URL" not in incoming: if not self.display_interface: return 'message.mako', dict( status='info', message="The interface for this tool cannot be displayed", refresh_frames=['everything'] ) + if len(incoming): + self.update_state( trans, self.inputs_by_page[state.page], state.inputs, incoming, old_errors=old_errors or {} ) return "tool_form.mako", dict( errors={}, tool_state=state, param_values={}, incoming={} ) # Process incoming data if not( self.check_values ): diff -r c7bde6953174eabe5510c89d023ffd8232592f11 -r 7fe3612562eea76387e88ab7d184fccc3160cb43 lib/galaxy/webapps/galaxy/controllers/root.py --- a/lib/galaxy/webapps/galaxy/controllers/root.py +++ b/lib/galaxy/webapps/galaxy/controllers/root.py @@ -22,7 +22,8 @@ return trans.fill_template( "root/index.mako", tool_id=tool_id, workflow_id=workflow_id, - m_c=m_c, m_a=m_a ) + m_c=m_c, m_a=m_a, + params=kwd ) ## ---- Tool related ----------------------------------------------------- diff -r c7bde6953174eabe5510c89d023ffd8232592f11 -r 7fe3612562eea76387e88ab7d184fccc3160cb43 templates/webapps/galaxy/root/index.mako --- a/templates/webapps/galaxy/root/index.mako +++ b/templates/webapps/galaxy/root/index.mako @@ -118,7 +118,7 @@ if trans.app.config.require_login and not trans.user: center_url = h.url_for( controller='user', action='login' ) elif tool_id is not None: - center_url = h.url_for( 'tool_runner', tool_id=tool_id, from_noframe=True ) + center_url = h.url_for( 'tool_runner', tool_id=tool_id, from_noframe=True, **params ) elif workflow_id is not None: center_url = h.url_for( controller='workflow', action='run', id=workflow_id ) elif m_c is not None: Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.