1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c5415e67cae2/ Changeset: c5415e67cae2 User: guerler Date: 2015-01-29 05:38:02+00:00 Summary: Workflow: Add tool form switch to config, fix late validation check Affected #: 4 files diff -r 2de1b7c819a2a1083b86d0d16ac2c6cd182578cf -r c5415e67cae27304e628103d249264753ad0d7cc config/galaxy.ini.sample --- a/config/galaxy.ini.sample +++ b/config/galaxy.ini.sample @@ -757,6 +757,9 @@ # Use new tool form #toolform_upgrade = True +# Use new tool form in workflow editor +#workflow_toolform_upgrade = False + # Enable Galaxy to communicate directly with a sequencer #enable_sequencer_communication = False diff -r 2de1b7c819a2a1083b86d0d16ac2c6cd182578cf -r c5415e67cae27304e628103d249264753ad0d7cc lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -945,7 +945,7 @@ # Old style dynamic options, no dependency information so there isn't # a lot we can do: if we're dealing with workflows, have to assume # late validation no matter what. - if self.dynamic_options is not None and ( trans is None or trans.workflow_building_mode ): + if (self.dynamic_options is not None or self.is_dynamic is not None) and ( trans is None or trans.workflow_building_mode ): return True # If we got this far, we can actually look at the dependencies # to see if their values will not be available until runtime. diff -r 2de1b7c819a2a1083b86d0d16ac2c6cd182578cf -r c5415e67cae27304e628103d249264753ad0d7cc templates/webapps/galaxy/workflow/editor.mako --- a/templates/webapps/galaxy/workflow/editor.mako +++ b/templates/webapps/galaxy/workflow/editor.mako @@ -33,7 +33,9 @@ <script type='text/javascript'> // Switch for new tool form - __NEWTOOLFORM__ = false; + %if util.string_as_bool(trans.app.config.get('workflow_toolform_upgrade', False)): + __NEWTOOLFORM__ = true; + %endif // Globals workflow = null; diff -r 2de1b7c819a2a1083b86d0d16ac2c6cd182578cf -r c5415e67cae27304e628103d249264753ad0d7cc templates/webapps/galaxy/workflow/editor_tool_form.mako --- a/templates/webapps/galaxy/workflow/editor_tool_form.mako +++ b/templates/webapps/galaxy/workflow/editor_tool_form.mako @@ -1,5 +1,5 @@ ## TEMPORARY SWITCH FOR THE NEW TOOL FORM -%if False: +%if util.string_as_bool(trans.app.config.get('workflow_toolform_upgrade', False)): ${h.js("libs/bibtex", "libs/jquery/jquery-ui")} ${h.css('jquery-ui/smoothness/jquery-ui')} <% 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.