Skip to content

Commit

Permalink
Merge pull request #5443 from jmchilton/fix5117
Browse files Browse the repository at this point in the history
 [18.01] Don't silently fail rest of multi-action queue when attempting to purge a collection.
  • Loading branch information
martenson authored Feb 20, 2018
2 parents af7b0ab + f6ac135 commit 6a3ce34
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion client/galaxy/scripts/mvc/history/history-view-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,12 @@ var HistoryViewEdit = _super.extend(
func: function() {
if (confirm(_l("This will permanently remove the data in your datasets. Are you sure?"))) {
var action = HDA_MODEL.HistoryDatasetAssociation.prototype.purge;
panel.getSelectedModels().ajaxQueue(action);
const historyContents = panel.getSelectedModels();
const selectedDatasets = historyContents.filter(
c =>
c.get("history_content_type") == "dataset"
)
historyContents.ajaxQueue(action, {}, selectedDatasets);
}
}
});
Expand Down

0 comments on commit 6a3ce34

Please sign in to comment.