opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_20.01' into release_20.05

Browse Source
This commit is contained in:
Nicola Soranzo
2020-10-27 16:46:40 +00:00
parent 535c236850 06ef6b3e8d
commit 24db43ae73
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
+2 -1
View File
@@ -66,8 +66,9 @@ var DatasetListItemEdit = _super.extend(
const Galaxy = getGalaxyInstance();
if (Galaxy.router) {
ev.preventDefault();
const identifier = self.model.get("element_id") || self.model.get("id");
Galaxy.router.push("datasets/edit", {
dataset_id: self.model.attributes.id,
dataset_id: identifier,
});
}
},
client/galaxy/scripts/mvc/dataset/dataset-li.js
+2 -1
View File
@@ -184,7 +184,8 @@ export var DatasetListItemView = _super.extend(
const Galaxy = getGalaxyInstance();
if (Galaxy.frame && Galaxy.frame.active) {
// Add dataset to frames.
Galaxy.frame.addDataset(self.model.get("id"));
const identifier = self.model.get("element_id") || self.model.get("id");
Galaxy.frame.addDataset(identifier);
ev.preventDefault();
}
};
lib/galaxy/jobs/__init__.py
+4 -3
View File
@@ -1940,13 +1940,14 @@ class JobWrapper(HasResourceParameters):
return self.output_paths
def get_output_path(self, dataset):
if getattr(dataset, "fake_dataset_association", False):
return dataset.file_name
assert dataset.id is not None, "{} needs to be flushed to find output path".format(dataset)
if self.output_paths is None:
self.compute_outputs()
for (hda, dataset_path) in self.output_hdas_and_paths.values():
if hda == dataset:
if hda.id == dataset.id:
return dataset_path
if getattr(dataset, "fake_dataset_association", False):
return dataset.file_name
raise KeyError("Couldn't find job output for [%s] in [%s]" % (dataset, self.output_hdas_and_paths.values()))
def get_mutable_output_fnames(self):