# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User rc # Date 1283369397 14400 # Node ID eb75925d4b9705ab8722cab41c321bf15a4b2359 # Parent e37392b073d89af5aea5e6206e9827ea6ad3f190 lims: find samples - bug fix: filtering results by only one state is working - UI improvements
--- a/templates/requests/common/find.mako +++ b/templates/requests/common/find.mako @@ -83,18 +83,19 @@ </div> %if results: <div class="form-row"> - <label><i>${results}</i></label> - <div class="toolParamHelp" style="clear: both;"> - The search results are sorted by the date the samples where created. - </div> + <label><i>${results}</i></label> + %if samples: + <div class="toolParamHelp" style="clear: both;"> + The search results are sorted by the date the samples where created. + </div> + %endif </div> %endif <div class="form-row"> %if samples: %for s in samples: <div class="form-row"> - - Sample: ${s.name} | Barcode: ${s.bar_code}<br/> + Sample: <b>${s.name}</b> | Barcode: ${s.bar_code}<br/> State: ${s.current_state().name}<br/> Datasets: <a href="${h.url_for(controller='requests_common', cntrller=cntrller, action='show_datatx_page', sample_id=trans.security.encode_id(s.id))}">${s.transferred_dataset_files()}/${len(s.datasets)}</a><br/> %if cntrller == 'requests_admin': @@ -103,7 +104,6 @@ <div class="toolParamHelp" style="clear: both;"><a href="${h.url_for( controller=cntrller, action='list', operation='show', id=trans.security.encode_id(s.request.id))}">Sequencing request: ${s.request.name} | Type: ${s.request.type.name} | State: ${s.request.state()}</a></div> - </div><br/> %endfor
--- a/lib/galaxy/web/controllers/requests_common.py +++ b/lib/galaxy/web/controllers/requests_common.py @@ -1287,7 +1287,7 @@ class RequestsCommon( BaseController, Us if params.get('go_button', '') == 'Find': search_string = kwd.get( 'search_box', '' ) search_type = params.get( 'search_type', '' ) - request_states = params.get( 'request_states', '' ) + request_states = util.listify( params.get( 'request_states', '' ) ) samples = [] if search_type == 'barcode': samples = trans.sa_session.query( trans.app.model.Sample ) \