1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/80db2712720c/
Changeset: 80db2712720c
User: carlfeberhard
Date: 2013-10-21 23:32:12
Summary: Histories API: use proper logging technique for exceptions
Affected #: 1 file
diff -r fbf1898d7dea43a46a0f8ec80fd41540ac6fc204 -r 80db2712720c4ea153e51bbc72e981cc9886e73c lib/galaxy/webapps/galaxy/api/histories.py
--- a/lib/galaxy/webapps/galaxy/api/histories.py
+++ b/lib/galaxy/webapps/galaxy/api/histories.py
@@ -113,7 +113,7 @@
except Exception, e:
msg = "Error in history API at showing history detail: %s" % ( str( e ) )
- log.exception( e )
+ log.exception( msg )
trans.response.status = 500
return msg
@@ -148,7 +148,7 @@
except Exception, e:
msg = "Error in history API when switching current history: %s" % ( str( e ) )
- log.exception( e )
+ log.exception( msg )
trans.response.status = 500
return msg
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.
2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/3b4cbba69871/
Changeset: 3b4cbba69871
Branch: next-stable
User: jgoecks
Date: 2013-10-21 23:11:17
Summary: Use progressive approach to integrate tabular chunked data display into collaboration framework. This fixes a bug that prevented chunkable datasets from being viewable in pages.
Affected #: 1 file
diff -r 81880a04e6e79d944a6d9c225b36417114cd38ec -r 3b4cbba69871ab36384f1f8b28cb5555ba3dd20b templates/webapps/galaxy/dataset/display.mako
--- a/templates/webapps/galaxy/dataset/display.mako
+++ b/templates/webapps/galaxy/dataset/display.mako
@@ -18,6 +18,12 @@
});
require(['mvc/data'], function(data) {
+ //
+ // Use tabular data display progressively by deleting data from page body
+ // and then showing dataset view.
+ //
+ $('.page-body').children().remove();
+
data.createTabularDatasetChunkedView(
// Dataset config. TODO: encode id.
_.extend( ${h.to_json_string( item.to_dict() )},
@@ -59,10 +65,10 @@
title="Import dataset"></a></%def>
+## Renders dataset content. Function is used to render data in stand-along page and to provide content for embedded datasets as well.
<%def name="render_item( data, data_to_render )">
- ## Chunkable data is rendered in JavaScript above; render unchunkable data below.
${ render_deleted_data_message( data ) }
- %if not data.datatype.CHUNKABLE and data_to_render:
+ %if data_to_render:
%if truncated:
<div class="warningmessagelarge">
This dataset is large and only the first megabyte is shown below. |
https://bitbucket.org/galaxy/galaxy-central/commits/fbf1898d7dea/
Changeset: fbf1898d7dea
User: jgoecks
Date: 2013-10-21 23:11:48
Summary: Automated merge of next-stable branch into default
Affected #: 1 file
diff -r 4f1c25230dd009efd1f04f8d7a74d83733f8b75a -r fbf1898d7dea43a46a0f8ec80fd41540ac6fc204 templates/webapps/galaxy/dataset/display.mako
--- a/templates/webapps/galaxy/dataset/display.mako
+++ b/templates/webapps/galaxy/dataset/display.mako
@@ -18,6 +18,12 @@
});
require(['mvc/data'], function(data) {
+ //
+ // Use tabular data display progressively by deleting data from page body
+ // and then showing dataset view.
+ //
+ $('.page-body').children().remove();
+
data.createTabularDatasetChunkedView(
// Dataset config. TODO: encode id.
_.extend( ${h.to_json_string( item.to_dict() )},
@@ -59,10 +65,10 @@
title="Import dataset"></a></%def>
+## Renders dataset content. Function is used to render data in stand-along page and to provide content for embedded datasets as well.
<%def name="render_item( data, data_to_render )">
- ## Chunkable data is rendered in JavaScript above; render unchunkable data below.
${ render_deleted_data_message( data ) }
- %if not data.datatype.CHUNKABLE and data_to_render:
+ %if data_to_render:
%if truncated:
<div class="warningmessagelarge">
This dataset is large and only the first megabyte is shown below. |
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.