opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_17.09' into dev

Browse Source
This commit is contained in:
Dannon Baker
2018-01-22 13:46:47 -05:00
parent ebafd19575 7996a4c0c7
commit 0e0303743d
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/tool/tool-form-base.js
+6
View File
@@ -245,6 +245,12 @@ export default FormBase.extend({
.addClass("ui-form-help")
.append(options.help);
$tmpl.find("a").attr("target", "_blank");
$tmpl.find("img").each( function() {
var img_src = $(this).attr("src");
if (img_src.indexOf("admin_toolshed") !== -1){
$(this).attr("src", Galaxy.root + img_src);
}
});
return $tmpl;
},
lib/galaxy/tools/parameters/grouping.py
+1 -1
View File
@@ -338,7 +338,7 @@ class UploadDataset(Group):
def get_url_paste_urls_or_filename(group_incoming, override_name=None, override_info=None):
url_paste_file = group_incoming.get('url_paste', None)
if url_paste_file is not None:
url_paste = open(url_paste_file, 'r').read(1024)
url_paste = open(url_paste_file, 'r').read()
def start_of_url(content):
start_of_url_paste = content.lstrip()[0:8].lower()