mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Automated merge with https://bitbucket.org/galaxy/galaxy-central
This commit is contained in:
@@ -250,7 +250,7 @@ class RootController( BaseUIController, UsesHistory, UsesAnnotations ):
|
||||
valid_chars = '.,^_-()[]0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
||||
fname = data.name
|
||||
fname = ''.join(c in valid_chars and c or '_' for c in fname)[0:150]
|
||||
trans.response.headers["Content-Disposition"] = "attachment; filename=GalaxyHistoryItem-%s-[%s]%s" % (data.hid, fname, toext)
|
||||
trans.response.headers["Content-Disposition"] = 'attachment; filename="GalaxyHistoryItem-%s-[%s]%s"' % (data.hid, fname, toext)
|
||||
trans.log_event( "Display dataset id: %s" % str(id) )
|
||||
try:
|
||||
return open( data.file_name )
|
||||
|
||||
@@ -1109,7 +1109,7 @@ class WorkflowController( BaseUIController, Sharable, UsesStoredWorkflow, UsesAn
|
||||
valid_chars = '.,^_-()[]0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
||||
sname = stored.name
|
||||
sname = ''.join(c in valid_chars and c or '_' for c in sname)[0:150]
|
||||
trans.response.headers["Content-Disposition"] = "attachment; filename=Galaxy-Workflow-%s.ga" % ( sname )
|
||||
trans.response.headers["Content-Disposition"] = 'attachment; filename="Galaxy-Workflow-%s.ga"' % ( sname )
|
||||
trans.response.set_content_type( 'application/galaxy-archive' )
|
||||
return stored_dict
|
||||
@web.expose
|
||||
|
||||
@@ -10,7 +10,7 @@ templates['panel_section'] = template(function (Handlebars,depth0,helpers,partia
|
||||
stack1 = foundHelper || depth0.id;
|
||||
if(typeof stack1 === functionType) { stack1 = stack1.call(depth0, { hash: {} }); }
|
||||
else if(stack1=== undef) { stack1 = helperMissing.call(depth0, "id", { hash: {} }); }
|
||||
buffer += escapeExpression(stack1) + "\">\n <a href=\"#\"><span>";
|
||||
buffer += escapeExpression(stack1) + "\">\n <a href=\"javascript:void(0)\"><span>";
|
||||
foundHelper = helpers.name;
|
||||
stack1 = foundHelper || depth0.name;
|
||||
if(typeof stack1 === functionType) { stack1 = stack1.call(depth0, { hash: {} }); }
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<div class="toolSectionTitle" id="title_{{id}}">
|
||||
<a href="#"><span>{{name}}</span></a>
|
||||
<a href="javascript:void(0)"><span>{{name}}</span></a>
|
||||
</div>
|
||||
<div id="{{id}}" class="toolSectionBody" style="display: none; ">
|
||||
<div class="toolSectionBg"></div>
|
||||
|
||||
Reference in New Issue
Block a user