1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/6997fa059319/
Changeset: 6997fa059319
User: afgane
Date: 2013-11-25 17:56:54
Summary: Fix tool_panel_section id retrieval (affected installation of tools via the API into an existing tool panel)
Affected #: 1 file
diff -r 87086657a2f4dbd44a2377f550fa6573876a8006 -r 6997fa059319b288877cf0728ac20fbb57e80dee lib/tool_shed/util/tool_util.py
--- a/lib/tool_shed/util/tool_util.py
+++ b/lib/tool_shed/util/tool_util.py
@@ -673,7 +673,7 @@
tool_panel_section_id=section_id,
new_tool_panel_section=new_tool_panel_section )
elif tool_panel_section:
- tool_panel_section_key = 'section_%s' % str( tool_panel_section )
+ tool_panel_section_key = 'section_%s' % str( tool_panel_section.id )
tool_section = trans.app.toolbox.tool_panel[ tool_panel_section_key ]
else:
return None, None
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/commits/87086657a2f4/
Changeset: 87086657a2f4
User: jmchilton
Date: 2013-11-25 16:47:18
Summary: Update datatypes.data:display_data's doc per Peter Cock's suggestion.
Affected #: 1 file
diff -r 35cc1687eb7b348811bf9e4f6e9d4374b00b6f09 -r 87086657a2f4dbd44a2377f550fa6573876a8006 lib/galaxy/datatypes/data.py
--- a/lib/galaxy/datatypes/data.py
+++ b/lib/galaxy/datatypes/data.py
@@ -288,7 +288,14 @@
return open( dataset.file_name )
def display_data(self, trans, data, preview=False, filename=None, to_ext=None, size=None, offset=None, **kwd):
- """ Old display method, for transition """
+ """ Old display method, for transition - though still used by API and
+ test framework. Datatypes should be very careful if overridding this
+ method and this interface between datatypes and Galaxy will likely
+ change.
+
+ TOOD: Document alternatives to overridding this method (data
+ providers?).
+ """
#Relocate all composite datatype display to a common location.
composite_extensions = trans.app.datatypes_registry.get_composite_extensions( )
composite_extensions.append('html') # for archiving composite datatypes
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/commits/5dfc0b3bf035/
Changeset: 5dfc0b3bf035
User: guerler
Date: 2013-11-25 06:16:41
Summary: Fix tagging mako
Affected #: 1 file
diff -r 6d8062a02641e8be1d1df7b9e87519662ac9c2d5 -r 5dfc0b3bf0351e7274cd3a5bdeab921752215973 templates/tagging_common.mako
--- a/templates/tagging_common.mako
+++ b/templates/tagging_common.mako
@@ -135,7 +135,6 @@
## Build script that augments tags using progressive javascript.
<script type="text/javascript">
- $(function() {
//
// Set up autocomplete tagger.
//
@@ -213,8 +212,6 @@
};
$('#${elt_id}').autocomplete_tagging(options);
-
- });
</script>
## Use style to hide/display the tag area.
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/commits/6d8062a02641/
Changeset: 6d8062a02641
User: guerler
Date: 2013-11-23 23:02:46
Summary: Grids: Fix for toolshed
Affected #: 2 files
diff -r 59c4b30557cd889472ad7162b1f1b5be3e01973a -r 6d8062a02641e8be1d1df7b9e87519662ac9c2d5 templates/webapps/tool_shed/category/grid.mako
--- a/templates/webapps/tool_shed/category/grid.mako
+++ b/templates/webapps/tool_shed/category/grid.mako
@@ -7,6 +7,7 @@
## TODO: This is very similar to this directory's valid_grid.mako, so see if we can re-use this code in a better way.
<%def name="render_grid_header( grid, repo_grid, render_title=True)">
${init()}
+ ${grid_javascripts()}
<div class="grid-header">
%if render_title:
${grid_title()}
diff -r 59c4b30557cd889472ad7162b1f1b5be3e01973a -r 6d8062a02641e8be1d1df7b9e87519662ac9c2d5 templates/webapps/tool_shed/category/valid_grid.mako
--- a/templates/webapps/tool_shed/category/valid_grid.mako
+++ b/templates/webapps/tool_shed/category/valid_grid.mako
@@ -6,6 +6,7 @@
## Render grid header.
<%def name="render_grid_header( grid, repo_grid, render_title=True)">
${init()}
+ ${grid_javascripts()}
<div class="grid-header">
%if render_title:
${grid_title()}
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/commits/13bd960b9414/
Changeset: 13bd960b9414
User: Dave Bouvier
Date: 2013-11-23 06:37:44
Summary: Correct typo in test framework.
Affected #: 1 file
diff -r a73e13655a942f83d9c475d522a861fb32b0148d -r 13bd960b94141a2974d0c968c26fc046e05e1d14 test/install_and_test_tool_shed_repositories/functional_tests.py
--- a/test/install_and_test_tool_shed_repositories/functional_tests.py
+++ b/test/install_and_test_tool_shed_repositories/functional_tests.py
@@ -506,7 +506,7 @@
( str( dependency.name ), str( dependency.type ), str( dependency.version ), unicodify( dependency.error_message ) ) )
test_result = dict( type=dependency.type,
name=dependency.name,
- version=sdependency.version,
+ version=dependency.version,
error_message=dependency.error_message )
repository_status_dict[ 'installation_errors' ][ 'tool_dependencies' ].append( test_result )
for dependency in repository.missing_repository_dependencies:
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.