Merge remote-tracking branch 'upstream/release_20.09' into release_21.01

This commit is contained in:
Dannon Baker
2021-03-16 11:19:40 -04:00
@@ -94,11 +94,12 @@ var ImportCollectionModal = Backbone.View.extend({
const new_history_name = this.modal.$("input[name=history_name]").val();
if (new_history_name !== "") {
this.createNewHistory(new_history_name)
.done((new_history) => {
.then((new_history) => {
Toast.success("History created");
this.collectionImport(collection_elements, new_history.id, new_history.name);
})
.fail((xhr, status, error) => {
.catch((error) => {
console.error(error);
Toast.error("An error occurred.");
});
} else {