Merge changes from PR https://bitbucket.org/galaxy/galaxy-central/pull-request/115/adding-dataset-uuid-display-and-setting/

lib/galaxy/model/__init__.py

@@ -1774,6 +1774,10 @@ class LibraryDataset( object ):
                      misc_info = ldda.info,
                      misc_blurb = ldda.blurb,
                      template_data = template_data )
+        if ldda.dataset.uuid is None:
+            rval['uuid'] = None
+        else:
+            rval['uuid'] = str(ldda.dataset.uuid)
         for name, spec in ldda.metadata.spec.items():
             val = ldda.metadata.get( name )
             if isinstance( val, MetadataFile ):

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/api/history_contents.py

@@ -220,6 +220,11 @@ def get_hda_dict( trans, history, hda, for_editing ):
     hda_dict[ 'display_apps' ] = get_display_apps( trans, hda )
     hda_dict[ 'display_types' ] = get_old_display_applications( trans, hda )
 
+    if hda.dataset.uuid is None:
+        hda_dict['uuid'] = None
+    else:
+        hda_dict['uuid'] = str(hda.dataset.uuid)
+
     hda_dict[ 'visualizations' ] = hda.get_visualizations()
     if hda.peek and hda.peek != 'no peek':
         hda_dict[ 'peek' ] = to_unicode( hda.display_peek() )

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/library/common/ldda_info.mako

@@ -100,6 +100,13 @@
             ${ldda.get_size( nice_size=True )}
             <div style="clear: both"></div>
         </div>
+        %if ldda.dataset.uuid:
+        <div class="form-row">
+            <label>UUID:</label>
+            ${ldda.dataset.uuid}
+            <div style="clear: both"></div>
+        </div>
+        %endif
         %if ldda.tool_version:
             <div class="form-row">
                 <label>Tool version:</label>

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: