1 new changeset in galaxy-central:

http://bitbucket.org/galaxy/galaxy-central/changeset/67f76a732e97/ changeset: r5131:67f76a732e97 user: rc date: 2011-02-25 22:12:17 summary: Bug fix: do not show sample field widgets in the view request page affected #: 4 files (49 bytes)

--- a/templates/requests/common/add_samples.mako Fri Feb 25 15:58:13 2011 -0500 +++ b/templates/requests/common/add_samples.mako Fri Feb 25 16:12:17 2011 -0500 @@ -71,7 +71,7 @@ ## Render the other grids <% trans.sa_session.refresh( request.type.sample_form ) %> %for grid_index, grid_name in enumerate( request.type.sample_form.layout ): - ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, adding_new_samples=True )} + ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, show_saved_samples_read_only=True )} %endfor %else: <label>There are no samples.</label>

--- a/templates/requests/common/common.mako Fri Feb 25 15:58:13 2011 -0500 +++ b/templates/requests/common/common.mako Fri Feb 25 16:12:17 2011 -0500 @@ -606,7 +606,7 @@ </tr></%def>

-<%def name="render_request_type_sample_form_grids( grid_index, grid_name, fields_dict, displayable_sample_widgets, adding_new_samples )"> +<%def name="render_request_type_sample_form_grids( grid_index, grid_name, fields_dict, displayable_sample_widgets, show_saved_samples_read_only )"><% if not grid_name: grid_name = "Sample form layout %s" % str( grid_index ) @@ -629,7 +629,7 @@ <% trans.sa_session.refresh( request ) %> %for sample_index, sample in enumerate( displayable_sample_widgets ): <% - if not adding_new_samples or sample_index >= len( request.samples ): + if not show_saved_samples_read_only or sample_index >= len( request.samples ): display_only = False else: display_only = True

--- a/templates/requests/common/edit_samples.mako Fri Feb 25 15:58:13 2011 -0500 +++ b/templates/requests/common/edit_samples.mako Fri Feb 25 16:12:17 2011 -0500 @@ -120,7 +120,7 @@ ## Render the other grids <% trans.sa_session.refresh( request.type.sample_form ) %> %for grid_index, grid_name in enumerate( request.type.sample_form.layout ): - ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, adding_new_samples=False )} + ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, show_saved_samples_read_only=False )} %endfor %else: <label>There are no samples.</label>

--- a/templates/requests/common/view_request.mako Fri Feb 25 15:58:13 2011 -0500 +++ b/templates/requests/common/view_request.mako Fri Feb 25 16:12:17 2011 -0500 @@ -162,7 +162,7 @@ ## Render the other grids <% trans.sa_session.refresh( request.type.sample_form ) %> %for grid_index, grid_name in enumerate( request.type.sample_form.layout ): - ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, adding_new_samples=False )} + ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, show_saved_samples_read_only=True )} %endfor %else: There are no samples.

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.