Merged in kellrott/galaxy-central (pull request #130)

Passing extra parameters from root index to tool index.

lib/galaxy/tools/__init__.py

@@ -1922,6 +1922,8 @@ class Tool( object ):
             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 ):

lib/galaxy/webapps/galaxy/controllers/root.py

@@ -22,7 +22,8 @@ class RootController( BaseUIController, UsesHistoryMixin, UsesAnnotations ):
         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 -----------------------------------------------------
     

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: