diff --git a/client/src/components/Collections/ListCollectionCreatorModal.js b/client/src/components/Collections/ListCollectionCreatorModal.js index 79beaff0912..7f0ee56abc2 100644 --- a/client/src/components/Collections/ListCollectionCreatorModal.js +++ b/client/src/components/Collections/ListCollectionCreatorModal.js @@ -36,7 +36,7 @@ function createListCollection(contents, defaultHideSourceItems = true) { id: element.id, name: element.name, //TODO: this allows for list:list even if the filter above does not - reconcile - src: element.history_content_type === "dataset" ? "hda" : "hdca", + src: element.src || (element.history_content_type == "dataset" ? "hda" : "hdca"), })); copyElements = !hideSourceItems; return contents.createHDCA(elements, "list", name, hideSourceItems, copyElements); diff --git a/client/src/components/Collections/PairCollectionCreatorModal.js b/client/src/components/Collections/PairCollectionCreatorModal.js index 653a27ec98a..7d9fe752d0f 100644 --- a/client/src/components/Collections/PairCollectionCreatorModal.js +++ b/client/src/components/Collections/PairCollectionCreatorModal.js @@ -29,8 +29,8 @@ function createPairCollection(contents, defaultHideSourceItems = true) { defaultHideSourceItems: defaultHideSourceItems, creationFn: function (elements, name, hideSourceItems) { elements = [ - { name: "forward", src: "hda", id: elements[0].id }, - { name: "reverse", src: "hda", id: elements[1].id }, + { name: "forward", src: elements[0].src || "hda", id: elements[0].id }, + { name: "reverse", src: elements[1].src || "hda", id: elements[1].id }, ]; copyElements = !hideSourceItems; return contents.createHDCA(elements, "paired", name, hideSourceItems, copyElements); diff --git a/client/src/components/Libraries/LibraryFolder/TopToolbar/import-to-history/import-collection.js b/client/src/components/Libraries/LibraryFolder/TopToolbar/import-to-history/import-collection.js index d91d2fd44c3..ecc305663b6 100644 --- a/client/src/components/Libraries/LibraryFolder/TopToolbar/import-to-history/import-collection.js +++ b/client/src/components/Libraries/LibraryFolder/TopToolbar/import-to-history/import-collection.js @@ -83,9 +83,9 @@ var ImportCollectionModal = Backbone.View.extend({ collection_item.name = dataset.name; collection_item.deleted = dataset.deleted; collection_item.state = dataset.state; + collection_item.src = "ldda"; collection_elements.push(collection_item); } - const new_history_name = this.modal.$("input[name=history_name]").val(); if (new_history_name !== "") { this.createNewHistory(new_history_name)