From 1a6a4b50de598c5ccba46339413d4cc086133464 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Sat, 23 Oct 2021 19:07:22 +0200 Subject: [PATCH] Set job id on dataset for discovered outputs --- lib/galaxy/jobs/__init__.py | 2 +- lib/galaxy/model/store/__init__.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py index 7dbed441341..d0bb015b6da 100644 --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -1709,7 +1709,7 @@ class JobWrapper(HasResourceParameters): user=job.user, tag_handler=self.app.tag_handler.create_tag_handler_session(), ) - import_model_store.perform_import(history=job.history) + import_model_store.perform_import(history=job.history, job=job) except Exception: log.exception(f"problem importing job outputs. stdout [{job.stdout}] stderr [{job.stderr}]") raise diff --git a/lib/galaxy/model/store/__init__.py b/lib/galaxy/model/store/__init__.py index 8689ecabfed..0c6072ea2a6 100644 --- a/lib/galaxy/model/store/__init__.py +++ b/lib/galaxy/model/store/__init__.py @@ -217,6 +217,8 @@ class ModelImportStore(metaclass=abc.ABCMeta): if 'id' in dataset_attrs["dataset"] and self.import_options.allow_edit: dataset_instance.dataset.id = dataset_attrs["dataset"]['id'] + if job: + dataset_instance.dataset.job_id = job.id if 'id' in dataset_attrs and self.import_options.allow_edit and not self.sessionless: dataset_instance = self.sa_session.query(getattr(model, dataset_attrs['model_class'])).get(dataset_attrs["id"])