commit/galaxy-central: 2 new changesets

11 Oct 2012

2 new commits in galaxy-central:


https://bitbucket.org/galaxy/galaxy-central/changeset/837eb8d9098e/
changeset:   837eb8d9098e
user:        dan
date:        2012-10-11 19:47:10
summary:     Fix for viewing errors by bug link on a copied dataset.
affected #:  1 file

diff -r 046634d0500730333eb181399eaa097b1d9f4343 -r 837eb8d9098ed1e9faa3e651dc7552ef014238fe lib/galaxy/webapps/galaxy/controllers/dataset.py

--- a/lib/galaxy/webapps/galaxy/controllers/dataset.py
+++ b/lib/galaxy/webapps/galaxy/controllers/dataset.py
@@ -221,7 +221,7 @@
             return trans.show_error_message( "Error reporting has been disabled for this galaxy instance" )
         # Get the dataset and associated job
         hda = trans.sa_session.query( model.HistoryDatasetAssociation ).get( id )
-        job = hda.creating_job_associations[0].job
+        job = hda.creating_job
         # Get the name of the server hosting the Galaxy instance from which this report originated
         host = trans.request.host
         history_view_link = "%s/history/view?id=%s" % ( str( host ), trans.security.encode_id( hda.history_id ) )



https://bitbucket.org/galaxy/galaxy-central/changeset/b27aa5db944d/
changeset:   b27aa5db944d
user:        dan
date:        2012-10-11 19:47:11
summary:     When sending bug report email on a copied dataset, fill in Job info.
affected #:  1 file

diff -r 837eb8d9098ed1e9faa3e651dc7552ef014238fe -r b27aa5db944d3c3a79c9bedf9d91fe2a2e89e01d templates/dataset/errors.mako
--- a/templates/dataset/errors.mako
+++ b/templates/dataset/errors.mako
@@ -19,9 +19,9 @@
     <body><h2>Dataset generation errors</h2><p><b>Dataset ${hda.hid}: ${hda.display_name()}</b></p>
-
-        %if hda.creating_job_associations:
-            <% job = hda.creating_job_associations[0].job %>
+        <% job = hda.creating_job %>
+        %if job:
+            
             %if job.traceback:
                 The Galaxy framework encountered the following error while attempting to run the tool:
                 <pre>${ util.unicodify( job.traceback ) | h}</pre>

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.

    

Bitbucket

tags

participants (1)