opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

sample tracking UI fixes

Browse Source
This commit is contained in:
Ramkrishna Chakrabarty
2010-10-13 16:35:39 -04:00
parent 381b72258a
commit ed6b6664e3
2 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/controllers/requests_admin.py
+2 -1
View File
@@ -393,7 +393,8 @@ class RequestsAdmin( BaseController, UsesFormDefinitionWidgets ):
# 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'
templates/requests/common/manage_request.mako
+28 -28
View File
@@ -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