2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/dcdf81ee5f8f/ Changeset: dcdf81ee5f8f Branch: stable User: dan Date: 2013-04-04 19:01:39 Summary: Fix for preview flag in Dataset display. Affected #: 2 files diff -r 6c234a64e7b287565c968f128b047aabec78ec50 -r dcdf81ee5f8f1dfee442ccb4c121048610d8f7f5 lib/galaxy/datatypes/data.py --- a/lib/galaxy/datatypes/data.py +++ b/lib/galaxy/datatypes/data.py @@ -343,6 +343,7 @@ max_peek_size = 1000000 # 1 MB if isinstance(data.datatype, datatypes.images.Html): max_peek_size = 10000000 # 10 MB for html + preview = util.string_as_bool( preview ) if not preview or isinstance(data.datatype, datatypes.images.Image) or os.stat( data.file_name ).st_size < max_peek_size: if trans.app.config.sanitize_all_html and trans.response.get_content_type() == "text/html": # Sanitize anytime we respond with plain text/html content. diff -r 6c234a64e7b287565c968f128b047aabec78ec50 -r dcdf81ee5f8f1dfee442ccb4c121048610d8f7f5 lib/galaxy/datatypes/tabular.py --- a/lib/galaxy/datatypes/tabular.py +++ b/lib/galaxy/datatypes/tabular.py @@ -268,6 +268,7 @@ return to_json_string({'ck_data': ck_data, 'ck_index': ck_index+1}) def display_data(self, trans, dataset, preview=False, filename=None, to_ext=None, chunk=None): + preview = util.string_as_bool( preview ) if chunk: return self.get_chunk(trans, dataset, chunk) elif to_ext or not preview: https://bitbucket.org/galaxy/galaxy-central/commits/4d490e2342a4/ Changeset: 4d490e2342a4 User: dan Date: 2013-04-04 19:01:39 Summary: Fix for preview flag in Dataset display. Affected #: 2 files diff -r bd6f6d6457624d8c59f7d821b6a478e81d70b558 -r 4d490e2342a406453316d592e78dee41b0acadd3 lib/galaxy/datatypes/data.py --- a/lib/galaxy/datatypes/data.py +++ b/lib/galaxy/datatypes/data.py @@ -343,6 +343,7 @@ max_peek_size = 1000000 # 1 MB if isinstance(data.datatype, datatypes.images.Html): max_peek_size = 10000000 # 10 MB for html + preview = util.string_as_bool( preview ) if not preview or isinstance(data.datatype, datatypes.images.Image) or os.stat( data.file_name ).st_size < max_peek_size: if trans.app.config.sanitize_all_html and trans.response.get_content_type() == "text/html": # Sanitize anytime we respond with plain text/html content. diff -r bd6f6d6457624d8c59f7d821b6a478e81d70b558 -r 4d490e2342a406453316d592e78dee41b0acadd3 lib/galaxy/datatypes/tabular.py --- a/lib/galaxy/datatypes/tabular.py +++ b/lib/galaxy/datatypes/tabular.py @@ -268,6 +268,7 @@ return to_json_string({'ck_data': ck_data, 'ck_index': ck_index+1}) def display_data(self, trans, dataset, preview=False, filename=None, to_ext=None, chunk=None): + preview = util.string_as_bool( preview ) if chunk: return self.get_chunk(trans, dataset, chunk) elif to_ext or not preview: Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.