opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-01 15:37:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_19.01' into dev

Browse Source
This commit is contained in:
John Chilton
2019-02-26 14:28:20 -05:00
parent ccdf4fb0b6 7553326ba1
commit 574cc22a08
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/workflow/workflow.js
+11 -7
View File
@@ -195,13 +195,14 @@ const WorkflowListView = Backbone.View.extend({
},
events: {
dragleave: "unhighlightDropZone",
drop: "drop",
dragover: function(ev) {
$(".hidden_description_layer").addClass("dragover");
$(".menubutton").addClass("background-none");
ev.preventDefault();
}
dragover: "highlightDropZone",
dragleave: "unhighlightDropZone"
},
highlightDropZone: function(ev) {
$(".hidden_description_layer").addClass("dragover");
$(".menubutton").addClass("background-none");
ev.preventDefault();
},
unhighlightDropZone: function() {
@@ -272,6 +273,9 @@ const WorkflowListView = Backbone.View.extend({
this.searchWorkflow(this.$(".search-wf"), this.$(".workflow-search tr"), minQueryLength);
this.adjustActiondropdown();
this._showArgErrors();
this.$(".hidden_description_layer")
.get(0)
.addEventListener("drop", _.bind(this.drop, this));
return this;
},
lib/galaxy/datatypes/proteomics.py
+3 -2
View File
@@ -488,7 +488,7 @@ class Analyze75(Binary):
self.add_composite_file(
'hdr',
description='The Analyze75 header file.',
is_binary=False)
is_binary=True)
"""The image file. Image data, whose data type and ordering are described by the header file."""
self.add_composite_file(
@@ -500,7 +500,8 @@ class Analyze75(Binary):
self.add_composite_file(
't2m',
description='The Analyze75 t2m file.',
optional='True', is_binary=True)
optional=True,
is_binary=True)
def generate_primary_file(self, dataset=None):
rval = ['<html><head><title>Analyze75 Composite Dataset.</title></head><p/>']
tools/data_source/upload.py
+1 -4
View File
@@ -178,10 +178,7 @@ def add_composite_file(dataset, registry, output_path, files_path):
# Find data type
if dataset.file_type is not None:
try:
datatype = registry.get_datatype_by_extension(dataset.file_type)
except Exception:
print("Unable to instantiate the datatype object for the file type '%s'" % dataset.file_type)
datatype = registry.get_datatype_by_extension(dataset.file_type)
def to_path(path_or_url):
is_url = path_or_url.find('://') != -1 # todo fixme