details: http://www.bx.psu.edu/hg/galaxy/rev/e7b899fb4462 changeset: 2681:e7b899fb4462 user: James Taylor <james@jamestaylor.org> date: Fri Sep 11 12:48:33 2009 -0400 description: Fix syntax error when running workflows. This is actually a regression in Mako, the multiline conditional in the elif was somehow causing it to improperly nest the if statements 2 file(s) affected in this change: eggs.ini templates/workflow/run.mako diffs (34 lines): diff -r 8877ef766447 -r e7b899fb4462 eggs.ini --- a/eggs.ini Fri Sep 11 11:26:26 2009 -0400 +++ b/eggs.ini Fri Sep 11 12:48:33 2009 -0400 @@ -31,7 +31,7 @@ elementtree = 1.2.6_20050316 lrucache = 0.2 ;lsprof - james -Mako = 0.2.4 +Mako = 0.2.5 MyghtyUtils = 0.52 nose = 0.9.1 NoseHTML = 0.2 @@ -79,7 +79,7 @@ docutils = http://downloads.sourceforge.net/docutils/docutils-0.4.tar.gz elementtree = http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz lrucache = http://evan.prodromou.name/lrucache/lrucache-0.2.tar.gz -Mako = http://www.makotemplates.org/downloads/Mako-0.2.4.tar.gz +Mako = http://www.makotemplates.org/downloads/Mako-0.2.5.tar.gz MyghtyUtils = http://cheeseshop.python.org/packages/source/M/MyghtyUtils/MyghtyUtils-0.52.... nose = http://www.somethingaboutorange.com/mrl/projects/nose/nose-0.9.1.tar.gz NoseHTML = http://dist.g2.bx.psu.edu/nosehtml-0.2.tar.bz2 diff -r 8877ef766447 -r e7b899fb4462 templates/workflow/run.mako --- a/templates/workflow/run.mako Fri Sep 11 11:26:26 2009 -0400 +++ b/templates/workflow/run.mako Fri Sep 11 12:48:33 2009 -0400 @@ -87,8 +87,7 @@ ${param.get_html_field( t, value, other_values ).get_html( str(step.id) + "|" + prefix )} <input type="hidden" name="${step.id}|__force_update__${prefix}${param.name}" value="true" /> %endif - %elif isinstance( value, RuntimeValue ) or \ - ( str(step.id) + '|__runtime__' + prefix + param.name ) in incoming: + %elif isinstance( value, RuntimeValue ) or ( str(step.id) + '|__runtime__' + prefix + param.name ) in incoming: ## On the first load we may see a RuntimeValue, so we write ## an input field using the initial value for the param. ## Subsequents posts will no longer have the runtime value