Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 685af5f7e49d02396c213f355d40f64d706a0691 https://github.com/galaxyproject/galaxy/commit/685af5f7e49d02396c213f355d40f... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-28 (Mon, 28 Jan 2019) Changed paths: M templates/webapps/galaxy/workflow/display.mako Log Message: ----------- Handle subworkflows in view workflow mako Otherwise displaying workflows with subworkflows via the "view" button errors with ``` File 'lib/galaxy/web/framework/middleware/error.py', line 154 in __call__ app_iter = self.application(environ, sr_checker) File '/bioinfo/guests/mvandenb/galaxy/.venv/local/lib/python2.7/site-packages/paste/recursive.py', line 85 in __call__ return self.application(environ, start_response) File '/bioinfo/guests/mvandenb/galaxy/.venv/local/lib/python2.7/site-packages/paste/httpexceptions.py', line 640 in __call__ return self.application(environ, start_response) File 'lib/galaxy/web/framework/base.py', line 143 in __call__ return self.handle_request(environ, start_response) File 'lib/galaxy/web/framework/base.py', line 222 in handle_request body = method(trans, **kwargs) File 'lib/galaxy/webapps/galaxy/controllers/workflow.py', line 233 in display_by_username_and_slug return self._display(trans, stored_workflow) File 'lib/galaxy/webapps/galaxy/controllers/workflow.py', line 269 in _display user_item_rating=user_item_rating, ave_item_rating=ave_item_rating, num_ratings=num_ratings) File 'lib/galaxy/web/framework/webapp.py', line 940 in fill_template_mako return template.render(**data) File '/bioinfo/guests/mvandenb/galaxy/.venv/local/lib/python2.7/site-packages/mako/template.py', line 462 in render return runtime._render(self, self.callable_, args, data) File '/bioinfo/guests/mvandenb/galaxy/.venv/local/lib/python2.7/site-packages/mako/runtime.py', line 838 in _render **_kwargs_for_callable(callable_, data)) File '/bioinfo/guests/mvandenb/galaxy/.venv/local/lib/python2.7/site-packages/mako/runtime.py', line 873 in _render_context _exec_template(inherit, lclcontext, args=args, kwargs=kwargs) File '/bioinfo/guests/mvandenb/galaxy/.venv/local/lib/python2.7/site-packages/mako/runtime.py', line 899 in _exec_template callable_(context, *args, **kwargs) File '/data/users/mvandenb/galaxy/database/template_cache/base/base_panels.mako.py', line 122 in render_body __M_writer(unicode(self.center_panel())) File '/data/users/mvandenb/galaxy/database/template_cache/display_base.mako.py', line 152 in render_center_panel __M_writer(unicode(self.render_content())) File '/data/users/mvandenb/galaxy/database/template_cache/display_base.mako.py', line 116 in render_render_content __M_writer(unicode(self.render_item( item, item_data ))) File '/data/users/mvandenb/galaxy/database/template_cache/workflow/display.mako.py', line 123 in render_render_item __M_writer(unicode(do_inputs( module.get_runtime_inputs(), step.state.inputs, "", step ))) File '/data/users/mvandenb/galaxy/database/template_cache/workflow/display.mako.py', line 78 in do_inputs return render_do_inputs(context,inputs,values,prefix,step,other_values) File '/data/users/mvandenb/galaxy/database/template_cache/workflow/display.mako.py', line 153 in render_do_inputs if input.type == "repeat": AttributeError: 'InputProxy' object has no attribute 'type' ``` Also allows displaying subworkflows as a nested table. Commit: 6630e6bd1ced92724808fbb5bf18069bd97fc0d8 https://github.com/galaxyproject/galaxy/commit/6630e6bd1ced92724808fbb5bf180... Author: John Chilton <jmchilton@gmail.com> Date: 2019-01-30 (Wed, 30 Jan 2019) Changed paths: M templates/webapps/galaxy/workflow/display.mako Log Message: ----------- Merge pull request #7276 from mvdbeek/subworkflow_view Handle subworkflows in view workflow mako Compare: https://github.com/galaxyproject/galaxy/compare/1a61f31ec5fd...6630e6bd1ced