2 new changesets in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/0ff5ad458dea/ changeset: 0ff5ad458dea user: kanwei date: 2011-07-21 19:13:48 summary: Return JSON for LibraryDatasetToolParam metadata affected #: 1 file (75 bytes) --- a/lib/galaxy/tools/__init__.py Thu Jul 21 13:03:04 2011 -0400 +++ b/lib/galaxy/tools/__init__.py Thu Jul 21 13:13:48 2011 -0400 @@ -2029,6 +2029,7 @@ def __str__( self ): return self.value.name def templates( self ): + """ Returns JSON dict of templates => data """ if not self.value: return None template_data = {} @@ -2039,7 +2040,7 @@ for field in template.fields: tmp_dict[field['label']] = content[field['name']] template_data[template.name] = tmp_dict - return template_data + return simplejson.dumps( template_data ) def __getattr__( self, key ): return getattr( self.value, key ) http://bitbucket.org/galaxy/galaxy-central/changeset/448490d701fa/ changeset: 448490d701fa user: kanwei date: 2011-07-21 19:14:13 summary: Fix workflow overlay error introduced in recent commit affected #: 1 file (35 bytes) --- a/templates/workflow/editor.mako Thu Jul 21 13:13:48 2011 -0400 +++ b/templates/workflow/editor.mako Thu Jul 21 13:14:13 2011 -0400 @@ -931,9 +931,9 @@ </div></%def> -<%def name="overlay()"> +<%def name="overlay(visible=False)"> ${parent.overlay( "Loading workflow editor...", - "<img src='" + h.url_for('/static/images/yui/rel_interstitial_loading.gif') + "'/>" )} + "<img src='" + h.url_for('/static/images/yui/rel_interstitial_loading.gif') + "'/>", self.overlay_visible )} </%def><%def name="left_panel()"> 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.