1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/8526b10ca125/
changeset: 8526b10ca125
user: jgoecks
date: 2012-10-31 20:58:28
summary: Fix bug in getting dataset id in 63f3b08
affected #: 1 file
diff -r 4ceab232dc02a5a99eca0b24c0038c490d49a392 -r 8526b10ca125a99de4d944e776e647c1598ffd06 lib/galaxy/web/base/controller.py
--- a/lib/galaxy/web/base/controller.py
+++ b/lib/galaxy/web/base/controller.py
@@ -249,7 +249,7 @@
# DEPRECATION: We still support unencoded ids for backward compatibility
try:
# encoded id?
- dataset_id = trans.security.decode_id
+ dataset_id = trans.security.decode_id( dataset_id )
except ( AttributeError, TypeError ), err:
# unencoded id
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/c0d8a9c916a5/
changeset: c0d8a9c916a5
user: dannon
date: 2012-10-30 20:08:59
summary: Tabular Display: left-align 'list' column type.
affected #: 1 file
diff -r 172502ced921425b301725949bd8a82ff858bc48 -r c0d8a9c916a50ef3f1fd7d67e987eba8f94e02a8 templates/dataset/tabular_chunked.mako
--- a/templates/dataset/tabular_chunked.mako
+++ b/templates/dataset/tabular_chunked.mako
@@ -18,7 +18,7 @@
if (colspan !== undefined){
return $('<td>').attr('colspan', colspan).addClass('stringalign').text(cell_contents);
}
- else if (COLUMN_TYPES[index] == 'str'){
+ else if (COLUMN_TYPES[index] == 'str' || COLUMN_TYPES[index] == 'list'){
/* Left align all str columns, right align the rest */
return $('<td>').addClass('stringalign').text(cell_contents);;
}
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/172502ced921/
changeset: 172502ced921
user: dan
date: 2012-10-30 19:46:12
summary: When migrating tools, if install_dependencies is True, but tool_dependency_dir is not set, do not attempt to install, but print informative error message.
affected #: 1 file
diff -r 394c3bd89926919b3ff861d5bc3daa6c7d10fd12 -r 172502ced921425b301725949bd8a82ff858bc48 lib/galaxy/tool_shed/install_manager.py
--- a/lib/galaxy/tool_shed/install_manager.py
+++ b/lib/galaxy/tool_shed/install_manager.py
@@ -19,6 +19,10 @@
self.app = app
self.toolbox = self.app.toolbox
self.migrated_tools_config = migrated_tools_config
+ # If install_dependencies is True, but tool_dependency_dir is not set,
+ # do not attempt to install, but print informative error message
+ if install_dependencies and app.config.tool_dependency_dir is None:
+ raise Exception( 'You are attempting to install tool dependencies, but do not have a value for "tool_dependency_dir" set in your ini file. Please set this to the path where you would like to install dependencies and rerun the migration script.' )
# Get the local non-shed related tool panel configs (there can be more than one, and the default name is tool_conf.xml).
self.proprietary_tool_confs = self.non_shed_tool_panel_configs
self.proprietary_tool_panel_elems = self.get_proprietary_tool_panel_elems( latest_migration_script_number )
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.