Bug fix: do not show sample field widgets in the view request page

This commit is contained in:
Ramkrishna Chakrabarty
2011-02-25 16:12:17 -05:00
parent 974efda97a
commit 3a88ba4cdb
4 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -71,7 +71,7 @@ ${render_samples_messages(request, is_admin, is_submitted, message, status)}
## 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>
+2 -2
View File
@@ -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
+1 -1
View File
@@ -120,7 +120,7 @@ ${render_samples_messages(request, is_admin, is_submitted, message, status)}
## 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>
+1 -1
View File
@@ -162,7 +162,7 @@ ${render_samples_messages(request, is_admin, is_submitted, message, status)}
## 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.