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

added some changes to fix

Browse Source
This commit is contained in:
zipho
2016-08-19 16:01:32 +02:00
parent d2ac5a001c
commit bede2907b9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/webapps/galaxy/library/common/common.mako
+2 -2
View File
@@ -282,12 +282,12 @@
name = 'files_0|to_posix_lines'
else:
name = 'to_posix_lines'
uni2posix = '<input type="checkbox" name="%s" value="true"%s/>No' % ( name, checked )
uni2posix = '<input type="checkbox" name="%s" value="true"%s/>Yes' % ( name, checked )
%>
${uni2posix}
</div>
<div class="toolParamHelp" style="clear: both;">
Use this option if you don't need your datasets to be converted from uni to posix line endings.
Use this option if you need your datasets to be converted from uni to posix line endings.
</div>
</div>
<div class="form-row">
tools/data_source/upload.py
+2 -2
View File
@@ -310,9 +310,9 @@ def add_file( dataset, registry, json_file, output_path ):
if dataset.to_posix_lines:
tmpdir = output_adjacent_tmpdir( output_path )
tmp_prefix = 'data_id_%s_convert_' % dataset.dataset_id
if dataset.space_to_tab and not dataset.to_posix_lines:
if dataset.space_to_tab:
line_count, converted_path = sniff.convert_newlines_sep2tabs( dataset.path, in_place=in_place, tmp_dir=tmpdir, tmp_prefix=tmp_prefix )
elif(not dataset.to_posix_lines):
else:
line_count, converted_path = sniff.convert_newlines( dataset.path, in_place=in_place, tmp_dir=tmpdir, tmp_prefix=tmp_prefix )
if dataset.file_type == 'auto':
ext = sniff.guess_ext( dataset.path, registry.sniff_order )