Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable tool input datatype validation for dropped history items #5657

Merged
merged 5 commits into from Mar 20, 2018
Merged

Disable tool input datatype validation for dropped history items #5657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd67cac
Ignore tool xml datatype settings for dragged history items
guerler Mar 7, 2018
abf6be7
Remove debug statements, use drop data where needed
guerler Mar 7, 2018
8412a72
Validate type using collection, from @jmchilton
guerler Mar 7, 2018
83adfc6
Add source to data entry
guerler Mar 7, 2018
617e3db
Add additional check for history items
guerler Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/collection/collection-view.js
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ var CollectionView = _super.extend(
initialize: function(attributes) {
_super.prototype.initialize.call(this, attributes);
this.linkTarget = attributes.linkTarget || "_blank";

this.dragItems = true;
this.hasUser = attributes.hasUser;
/** A stack of panels that currently cover or hide this panel */
this.panelStack = [];
Expand Down
15 changes: 13 additions & 2 deletions client/galaxy/scripts/mvc/ui/ui-select-content.js
View file
Open in desktop
Expand Up @@ -414,9 +414,20 @@ var View = Backbone.View.extend({
var field = this.fields[current];
var drop_data = JSON.parse(ev.originalEvent.dataTransfer.getData("text"))[0];
var new_id = drop_data.id;
var new_src = drop_data.history_content_type == "dataset" ? "hda" : "hdca";
var new_src = drop_data.history_content_type == "dataset_collection" ? "hdca" : "hda";
var new_value = { id: new_id, src: new_src };
if (data && _.findWhere(data[new_src], new_value)) {
if (data && drop_data.history_id) {
if (!_.findWhere(data[new_src], new_value)) {
data[new_src].push({
id: new_id,
src: new_src,
hid: drop_data.hid || "Dropped",
name: drop_data.hid ? drop_data.name : new_id,
keep: true,
tags: []
});
this._changeData();
}
if (config.src == new_src) {
var current_value = field.value();
if (current_value && config.multiple) {
Expand Down