# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User rc # Date 1286887059 14400 # Node ID 3c74359b7bb72c0d9cfc53e3f0b7a9e3ea426b87 # Parent d80539104bc3f4c20e555864346839be9299c70e sample_tracking bug fixes: - when adding new sample, sample index now starts from 1 instead of 0 - removed searching on user email on the request grid - replaced username with user email in request info page --- a/templates/requests/common/manage_request.mako +++ b/templates/requests/common/manage_request.mako @@ -135,7 +135,7 @@ <div class="toolParamHelp" style="clear: both;"><b>Sequencer</b>: ${request.type.name} %if is_admin: - | <b>User</b>: ${request.user.username} + | <b>User</b>: ${request.user.email} %endif %if request.is_submitted: | <b>State</b>: <i>${request.state}</i> --- a/lib/galaxy/web/controllers/requests_common.py +++ b/lib/galaxy/web/controllers/requests_common.py @@ -92,7 +92,7 @@ class RequestsGrid( grids.Grid ): ) ] columns.append( grids.MulticolFilterColumn( "Search", - cols_to_filter=[ columns[0], columns[1], columns[6] ], + cols_to_filter=[ columns[0], columns[1] ], key="free-text-search", visible=False, filterable="standard" ) ) @@ -859,7 +859,7 @@ class RequestsCommon( BaseController, Us # The user has selected a sample to copy. library_id = current_samples[ copy_sample_index][ 'library_select_field' ].get_selected( return_value=True ) folder_id = current_samples[ copy_sample_index ][ 'folder_select_field' ].get_selected( return_value=True ) - name = current_samples[ copy_sample_index ][ 'name' ] + '_%i' % ( index ) + name = current_samples[ copy_sample_index ][ 'name' ] + '_%i' % ( index+1 ) library_id = 'none' folder_id = 'none' field_values = [ val for val in current_samples[ copy_sample_index ][ 'field_values' ] ] @@ -867,7 +867,7 @@ class RequestsCommon( BaseController, Us # The user has not selected a sample to copy (may just be adding a sample). library_id = None folder_id = None - name = 'Sample_%i' % sample_index + name = 'Sample_%i' % ( sample_index+1 ) field_values = [ '' for field in request.type.sample_form.fields ] # Build the library_select_field and folder_select_field for the new sample being added. library_select_field, folder_select_field = self.__build_library_and_folder_select_fields( trans,