# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User rc # Date 1287002139 14400 # Node ID 76f09e5ccb85569b56e66676e4c761f4348336fc # Parent c0feb970e48de8b713a9a516cad61950ed0641b5 sample tracking UI fixes --- a/templates/requests/common/manage_request.mako +++ b/templates/requests/common/manage_request.mako @@ -132,38 +132,38 @@ <div class="grid-header"><h2>Sequencing Request "${request.name}"</h2> + + <ul class="manage-table-actions"> + <li><a class="action-button" id="seqreq-${request.id}-popup" class="menubutton">Sequencing Request Actions</a></li> + <div popupmenu="seqreq-${request.id}-popup"> + %if request.is_unsubmitted and request.samples: + <a class="action-button" confirm="More samples cannot be added to this request once it is submitted. Click OK to submit." href="${h.url_for( controller='requests_common', action='submit_request', cntrller=cntrller, id=trans.security.encode_id( request.id ) )}">Submit</a> + %endif + <a class="action-button" href="${h.url_for( controller='requests_common', action='request_events', cntrller=cntrller, id=trans.security.encode_id( request.id ) )}">History</a> + <a class="action-button" href="${h.url_for( controller='requests_common', action='edit_basic_request_info', cntrller=cntrller, id=trans.security.encode_id( request.id ) )}">Edit</a> + %if is_admin: + %if request.is_submitted: + <a class="action-button" href="${h.url_for( controller='requests_admin', action='reject', cntrller=cntrller, id=trans.security.encode_id( request.id ) )}">Reject</a> + <a class="action-button" href="${h.url_for( controller='requests_admin', action='get_data', request_id=trans.security.encode_id( request.id ) )}">Select datasets to transfer</a> + %endif + %endif + </div> + <li><a class="action-button" href="${h.url_for( controller=cntrller, action='browse_requests' )}">Browse requests</a></li> + </ul> + <div class="toolParamHelp" style="clear: both;"> - <b>Sequencer</b>: ${request.type.name} - %if is_admin: - | <b>User</b>: ${request.user.email} - %endif - %if request.is_submitted: - | <b>State</b>: <i>${request.state}</i> - %else: - | <b>State</b>: ${request.state} - %endif + <b>Sequencer</b>: ${request.type.name} + %if is_admin: + | <b>User</b>: ${request.user.email} + %endif + %if request.is_submitted: + | <b>State</b>: <i>${request.state}</i> + %else: + | <b>State</b>: ${request.state} + %endif </div></div> -<br/><br/> -<ul class="manage-table-actions"> - <li><a class="action-button" id="seqreq-${request.id}-popup" class="menubutton">Sequencing Request Actions</a></li> - <div popupmenu="seqreq-${request.id}-popup"> - %if request.is_unsubmitted and request.samples: - <a class="action-button" confirm="More samples cannot be added to this request once it is submitted. Click OK to submit." href="${h.url_for( controller='requests_common', action='submit_request', cntrller=cntrller, id=trans.security.encode_id( request.id ) )}">Submit</a> - %endif - <a class="action-button" href="${h.url_for( controller='requests_common', action='request_events', cntrller=cntrller, id=trans.security.encode_id( request.id ) )}">History</a> - <a class="action-button" href="${h.url_for( controller='requests_common', action='edit_basic_request_info', cntrller=cntrller, id=trans.security.encode_id( request.id ) )}">Edit</a> - %if is_admin: - %if request.is_submitted: - <a class="action-button" href="${h.url_for( controller='requests_admin', action='reject', cntrller=cntrller, id=trans.security.encode_id( request.id ) )}">Reject</a> - <a class="action-button" href="${h.url_for( controller='requests_admin', action='get_data', request_id=trans.security.encode_id( request.id ) )}">Select datasets to transfer</a> - %endif - %endif - </div> - <li><a class="action-button" href="${h.url_for( controller=cntrller, action='browse_requests' )}">Browse requests</a></li> -</ul> - %if request.has_samples_without_library_destinations: ${render_msg( "Select a target data library and folder for all the samples before starting the sequence run", "warning" )} %endif --- a/lib/galaxy/web/controllers/requests_admin.py +++ b/lib/galaxy/web/controllers/requests_admin.py @@ -393,7 +393,8 @@ class RequestsAdmin( BaseController, Use # get the sample these datasets are associated with try: sample = trans.sa_session.query( trans.model.Sample ).get( trans.security.decode_id( selected_sample_id ) ) - sample.library.id and sample.folder.id + if sample.name in sample.request.has_samples_without_library_destinations: + raise Exception() except: # if no sample (with associated library & folder) has been selected status = 'error'