diff --git a/lib/galaxy/model/mapping.py b/lib/galaxy/model/mapping.py index bc27765c6cc..ebb48a36acb 100644 --- a/lib/galaxy/model/mapping.py +++ b/lib/galaxy/model/mapping.py @@ -1309,6 +1309,7 @@ assign_mapper( context, GalaxySessionToHistoryAssociation, GalaxySessionToHistor history=relation( History ) ) ) HistoryDatasetAssociation.mapper.add_property( "creating_job_associations", relation( JobToOutputDatasetAssociation ) ) +LibraryDatasetDatasetAssociation.mapper.add_property( "creating_job_associations", relation( JobToOutputLibraryDatasetAssociation ) ) assign_mapper( context, Workflow, Workflow.table, properties=dict( steps=relation( WorkflowStep, backref='workflow', diff --git a/templates/library/common/ldda_info.mako b/templates/library/common/ldda_info.mako index de6a8864041..9bdb2947952 100644 --- a/templates/library/common/ldda_info.mako +++ b/templates/library/common/ldda_info.mako @@ -109,6 +109,21 @@ ${ldda.info}
+ <% job = ldda.creating_job_associations[0].job %> + %if job.stdout.strip() != '': +
+ +
${job.stdout}
+
+
+ %endif + %if job.stderr.strip() != '': +
+ +
${job.stderr}
+
+
+ %endif
${ldda.blurb}
diff --git a/tools/data_source/upload.py b/tools/data_source/upload.py index a5e943d05ff..fa0f2a3f7aa 100644 --- a/tools/data_source/upload.py +++ b/tools/data_source/upload.py @@ -373,6 +373,7 @@ def add_file( dataset, registry, json_file, output_path ): # Groom the dataset content if necessary datatype = registry.get_datatype_by_extension( ext ) datatype.groom_dataset_content( output_path ) + raise Exception( 'KAPOW' ) def add_composite_file( dataset, registry, json_file, output_path, files_path ): if dataset.composite_files: